diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-21 08:55:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-22 22:47:47 -0700 |
| commit | 1ca20358e769e5bf8f3567a658efe858f8550ff5 (patch) | |
| tree | fbfc064fa3062fc1b9e7f8cfc2c4af90a2dd2de6 /contrib/completion/git-completion.bash | |
| parent | 29f25d493c1021a53acf41e5763e732217dd75c3 (diff) | |
| parent | 6123d7196fdd9ac9aed24b4aeed854813fe9a6b1 (diff) | |
| download | git-1ca20358e769e5bf8f3567a658efe858f8550ff5.tar.xz | |
Merge branch 'mh/show-branch-color' into sb/show-branch-parse-options
* branch 'mh/show-branch-color':
bash completion: show-branch color support
show-branch: color the commit status signs
Diffstat (limited to 'contrib/completion/git-completion.bash')
| -rwxr-xr-x | contrib/completion/git-completion.bash | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index a0c5794828..451a97f078 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1365,7 +1365,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 ;; @@ -1510,6 +1511,7 @@ _git_config () color.interactive.help color.interactive.prompt color.pager + color.showbranch color.status color.status.added color.status.changed @@ -1821,6 +1823,7 @@ _git_show_branch () __gitcomp " --all --remotes --topo-order --current --more= --list --independent --merge-base --no-name + --color --no-color --sha1-name --sparse --topics --reflog " return |