undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
commit ffac6258de
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/config.txt
View File

@ -983,9 +983,10 @@ color.status.<slot>::
`added` or `updated` (files which are added but not committed), `added` or `updated` (files which are added but not committed),
`changed` (files which are changed but not added in the index), `changed` (files which are changed but not added in the index),
`untracked` (files which are not tracked by Git), `untracked` (files which are not tracked by Git),
`branch` (the current branch), or `branch` (the current branch),
`nobranch` (the color the 'no branch' warning is shown in, defaulting `nobranch` (the color the 'no branch' warning is shown in, defaulting
to red). to red), or
`unmerged` (files which have unmerged changes).
color.ui:: color.ui::
This variable determines the default value for variables such This variable determines the default value for variables such

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

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