summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-16 11:51:53 +0900
committerJunio C Hamano <gitster@pobox.com>2017-05-16 11:51:53 +0900
commit3900254bf29e00ad72de7a5b8e354369b2b84245 (patch)
tree9229761fc4f8b7a99d364045dc78ff010ba8df89 /contrib
parentdb3b1d5843354e2caf3c026b06834df7a55dcef6 (diff)
parent93fdf301de0daa57fd6a694ad4637ec7a3a1041c (diff)
downloadgit-3900254bf29e00ad72de7a5b8e354369b2b84245.tar.gz
Merge branch 'sk/status-short-branch-color-config'
The colors in which "git status --short --branch" showed the names of the current branch and its remote-tracking branch are now configurable. * sk/status-short-branch-color-config: status: add color config slots for branch info in "--short --branch" status: fix missing newline when comment chars are disabled
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash2
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index af658995d5..e77498dd9c 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2387,7 +2387,9 @@ _git_config ()
color.status.added
color.status.changed
color.status.header
+ color.status.localBranch
color.status.nobranch
+ color.status.remoteBranch
color.status.unmerged
color.status.untracked
color.status.updated