Merge branch 'mh/show-branch-color'

* mh/show-branch-color:
bash completion: show-branch color support
show-branch: color the commit status signs

Conflicts:
contrib/completion/git-completion.bash

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git-show-branch.txt
Simple merge

diff --cc builtin-show-branch.c
Simple merge

diff --cc contrib/completion/git-completion.bash
index f8d4cb2c7d6afd2d4f35572148de06ad3e542647,b5883872628f8ffa3972e7a082d0a62c12037845..ba13c4948cffe9df31d2d6d5a223a29e23b4817a
--- 1/contrib/completion/git-completion.bash
--- 2/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1854,7 -1678,8 +1856,8 @@@ _git_show_branch (
                __gitcomp "
                        --all --remotes --topo-order --current --more=
                        --list --independent --merge-base --no-name
 -                      --sha1-name --topics --reflog
+                       --color --no-color
 +                      --sha1-name --sparse --topics --reflog
                        "
                return
                ;;