diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-18 08:59:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-18 08:59:48 -0700 |
| commit | 96825a805419628c35f9fea70997aa749dbb2750 (patch) | |
| tree | 86e53f950158a442f082ad61d0ba755ace49cfec /contrib | |
| parent | 7f1eaec7f477fb3e81b9c5489d9ecf9bbefe0b8c (diff) | |
| parent | 6123d7196fdd9ac9aed24b4aeed854813fe9a6b1 (diff) | |
| download | git-96825a805419628c35f9fea70997aa749dbb2750.tar.gz git-96825a805419628c35f9fea70997aa749dbb2750.tar.xz | |
Merge branch 'mh/show-branch-color'
* mh/show-branch-color:
bash completion: show-branch color support
show-branch: color the commit status signs
Conflicts:
contrib/completion/git-completion.bash
Diffstat (limited to 'contrib')
| -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 f8d4cb2c7..ba13c4948 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1394,7 +1394,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 ;; @@ -1543,6 +1544,7 @@ _git_config () color.interactive.help color.interactive.prompt color.pager + color.showbranch color.status color.status.added color.status.changed @@ -1854,6 +1856,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 |