diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-23 19:23:30 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-23 19:23:31 +0100 |
| commit | ffac6258de4f72e06b6b2e412deffb00a1abb339 (patch) | |
| tree | ecd845244f27808535b8d0d062379d03874b2e03 /contrib | |
| parent | Merge branch 'jc/decorate-leaky-separator-color' into maint (diff) | |
| parent | config,completion: add color.status.unmerged (diff) | |
| download | git-ffac6258de4f72e06b6b2e412deffb00a1abb339.tar.xz git-ffac6258de4f72e06b6b2e412deffb00a1abb339.zip | |
Merge branch 'mg/doc-status-color-slot' into maint
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 8cfee95f88..1e8965b828 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2014,6 +2014,7 @@ _git_config () color.status.changed color.status.header color.status.nobranch + color.status.unmerged color.status.untracked color.status.updated color.ui |