mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mh/show-branch-color'

Browse Source 
* mh/show-branch-color:
  bash completion: show-branch color support
  show-branch: color the commit status signs

Conflicts:
	contrib/completion/git-completion.bash
This commit is contained in:
Junio C Hamano
2009-05-18 08:59:48 -07:00
parent 7f1eaec7f4 6123d7196f
commit 96825a8054
4 changed files with 66 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/completion/git-completion.bash
View File

@ -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