aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-show-branch.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-05-18 08:59:48 -0700
committerJunio C Hamano <gitster@pobox.com>2009-05-18 08:59:48 -0700
commit96825a805419628c35f9fea70997aa749dbb2750 (patch)
tree86e53f950158a442f082ad61d0ba755ace49cfec /Documentation/git-show-branch.txt
parent7f1eaec7f477fb3e81b9c5489d9ecf9bbefe0b8c (diff)
parent6123d7196fdd9ac9aed24b4aeed854813fe9a6b1 (diff)
downloadgit-96825a805419628c35f9fea70997aa749dbb2750.tar.gz
git-96825a805419628c35f9fea70997aa749dbb2750.tar.xz
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
Diffstat (limited to 'Documentation/git-show-branch.txt')
-rw-r--r--Documentation/git-show-branch.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index 51a4e9d6d..edd8f6463 100644
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -10,6 +10,7 @@ SYNOPSIS
[verse]
'git show-branch' [--all] [--remotes] [--topo-order] [--current]
[--more=<n> | --list | --independent | --merge-base]
+ [--color | --no-color]
[--no-name | --sha1-name] [--topics] [<rev> | <glob>]...
'git show-branch' (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]
@@ -107,6 +108,14 @@ OPTIONS
When no explicit <ref> parameter is given, it defaults to the
current branch (or `HEAD` if it is detached).
+--color::
+ Color the status sign (one of these: `*` `!` `+` `-`) of each commit
+ corresponding to the branch it's in.
+
+--no-color::
+ Turn off colored output, even when the configuration file gives the
+ default to color output.
+
Note that --more, --list, --independent and --merge-base options
are mutually exclusive.