summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorStephen Boyd <bebarino@gmail.com>2009-06-30 04:24:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-06-30 18:20:04 (GMT)
commit6fac1b83bdb9aee73363f93874ffaffd1bc3ad5c (patch)
treeff2286cd44abb420c6b4715a4a4e6b2ff175946e /contrib
parentb8e8db281cea9641253233a2bf8d01ab1f908abe (diff)
downloadgit-6fac1b83bdb9aee73363f93874ffaffd1bc3ad5c.zip
git-6fac1b83bdb9aee73363f93874ffaffd1bc3ad5c.tar.gz
git-6fac1b83bdb9aee73363f93874ffaffd1bc3ad5c.tar.bz2
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')
-rwxr-xr-xcontrib/completion/git-completion.bash5
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index b60cb68..ddb71e2 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