aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorMarkus Heidelberg <markus.heidelberg@web.de>2009-04-25 13:46:14 +0200
committerJunio C Hamano <gitster@pobox.com>2009-04-25 08:47:03 -0700
commit6123d7196fdd9ac9aed24b4aeed854813fe9a6b1 (patch)
tree04990ec3de9e82fe8a9491c7e35821df853df09c /contrib
parentab07ba2a2436cc717b872387320297bb806d35d9 (diff)
downloadgit-6123d7196fdd9ac9aed24b4aeed854813fe9a6b1.tar.gz
git-6123d7196fdd9ac9aed24b4aeed854813fe9a6b1.tar.xz
bash completion: show-branch color support
This implements completion of --color and --no-color for "git show-branch" and color.showbranch for "git config". Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/completion/git-completion.bash5
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 1a90cb87f..b58838726 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1333,7 +1333,8 @@ _git_config ()
__gitcomp "$(__git_merge_strategies)"
return
;;
- color.branch|color.diff|color.interactive|color.status|color.ui)
+ color.branch|color.diff|color.interactive|\
+ color.showbranch|color.status|color.ui)
__gitcomp "always never auto"
return
;;
@@ -1415,6 +1416,7 @@ _git_config ()
color.interactive.help
color.interactive.prompt
color.pager
+ color.showbranch
color.status
color.status.added
color.status.changed
@@ -1676,6 +1678,7 @@ _git_show_branch ()
__gitcomp "
--all --remotes --topo-order --current --more=
--list --independent --merge-base --no-name
+ --color --no-color
--sha1-name --topics --reflog
"
return