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
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user