From: Junio C Hamano Date: Mon, 23 Mar 2015 18:23:30 +0000 (-0700) Subject: Merge branch 'mg/doc-status-color-slot' into maint X-Git-Tag: v2.3.4~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ffac6258de4f72e06b6b2e412deffb00a1abb339;p=thirdparty%2Fgit.git Merge branch 'mg/doc-status-color-slot' into maint Documentation fixes. * mg/doc-status-color-slot: config,completion: add color.status.unmerged --- ffac6258de4f72e06b6b2e412deffb00a1abb339 diff --cc Documentation/config.txt index efc7e68278,1779625297..1a8ddb41c7 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@@ -983,9 -957,12 +983,10 @@@ color.status.: `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). + to red), or + `unmerged` (files which have unmerged changes). - The values of these variables may be specified as in - color.branch.. color.ui:: This variable determines the default value for variables such