Merge branch 'mh/show-branch-color' into sb/show-branch-parse-options

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

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 a0c5794828a6ed00a3608d9ec22046478da83e96,b5883872628f8ffa3972e7a082d0a62c12037845..451a97f0788a195e186ad114edb895267a093143
--- 1/contrib/completion/git-completion.bash
--- 2/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1821,7 -1678,8 +1823,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
                ;;