diff options
| author |  Stephen Boyd <bebarino@gmail.com> | 2009-06-29 21:24:24 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2009-06-30 11:20:04 -0700 |
| commit | 6fac1b83bdb9aee73363f93874ffaffd1bc3ad5c (patch) | |
| tree | ff2286cd44abb420c6b4715a4a4e6b2ff175946e /contrib/completion | |
| parent | git log: add '--merges' flag to match '--no-merges' (diff) | |
| download | tgif-6fac1b83bdb9aee73363f93874ffaffd1bc3ad5c.tar.xz | |
completion: add missing config variables
Update to include branch.*.rebase, remote.*.pushurl, and
add.ignore-errors
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/completion')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index b60cb68a8b..ddb71e26fe 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1457,7 +1457,7 @@ _git_config () branch.*.*) local pfx="${cur%.*}." cur="${cur##*.}" - __gitcomp "remote merge mergeoptions" "$pfx" "$cur" + __gitcomp "remote merge mergeoptions rebase" "$pfx" "$cur" return ;; branch.*) @@ -1504,7 +1504,7 @@ _git_config () cur="${cur##*.}" __gitcomp " url proxy fetch push mirror skipDefaultUpdate - receivepack uploadpack tagopt + receivepack uploadpack tagopt pushurl " "$pfx" "$cur" return ;; @@ -1522,6 +1522,7 @@ _git_config () ;; esac __gitcomp " + add.ignore-errors alias. apply.whitespace branch.autosetupmerge |