development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 11:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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-17 16:01:34 -07:00
parent 9bb56e4753 0d6accc01d
commit 2a39bdb9a1
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Documentation/config.txt
View file

@ -956,9 +956,11 @@ color.status.<slot>::
`added` or `updated` (files which are added but not committed),
`changed` (files which are changed but not added in the index),
`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
to red). The values of these variables may be specified as in
to red), or
`unmerged` (files which have unmerged changes).
The values of these variables may be specified as in
color.branch.<slot>.
color.ui::

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

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