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

Documentation fixes.

* mg/doc-status-color-slot:
  config,completion: add color.status.unmerged
This commit is contained in:
Junio C Hamano
2015-03-23 11:23:30 -07:00
2 changed files with 4 additions and 2 deletions

View File

@@ -2014,6 +2014,7 @@ _git_config ()
color.status.changed
color.status.header
color.status.nobranch
color.status.unmerged
color.status.untracked
color.status.updated
color.ui