diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-18 02:01:34 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-18 02:01:34 +0300 |
| commit | 2a39bdb9a163f9f4ad11599dbeca87445eecb7d8 (patch) | |
| tree | 4b76762cbff4f9da95da827c6229a89574d80004 /contrib | |
| parent | 9bb56e47532db6fb7e97020ffa247ad5c54b1726 (diff) | |
| parent | 0d6accc01d4073d685ece5ba9fd0a439539a5a02 (diff) | |
Merge branch 'mg/doc-status-color-slot'
Documentation fixes.
* mg/doc-status-color-slot:
config,completion: add color.status.unmerged
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index f5ae5e3a8c..731c28998f 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -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 |