mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'mg/doc-status-color-slot'
Documentation fixes. * mg/doc-status-color-slot: config,completion: add color.status.unmerged
This commit is contained in:
commit
2a39bdb9a1
|
@ -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::
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue