Merge branch 'mg/doc-status-color-slot'

Documentation fixes. * mg/doc-status-color-slot: config,completion: add color.status.unmerged
2015-03-17 16:01:34 -07:00
parent 9bb56e4753 0d6accc01d
commit 2a39bdb9a1
2 changed files with 5 additions and 2 deletions
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@ -2011,6 +2011,7 @@ _git_config ()
 		color.status.changed
 		color.status.header
 		color.status.nobranch
+		color.status.unmerged
 		color.status.untracked
 		color.status.updated
 		color.ui