diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-05-21 08:55:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-22 22:47:47 -0700 |
| commit | 1ca20358e769e5bf8f3567a658efe858f8550ff5 (patch) | |
| tree | fbfc064fa3062fc1b9e7f8cfc2c4af90a2dd2de6 /Documentation/git-show-branch.txt | |
| parent | parse-options: add PARSE_OPT_LITERAL_ARGHELP for complicated argh's (diff) | |
| parent | bash completion: show-branch color support (diff) | |
| download | tgif-1ca20358e769e5bf8f3567a658efe858f8550ff5.tar.xz | |
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
Diffstat (limited to 'Documentation/git-show-branch.txt')
| -rw-r--r-- | Documentation/git-show-branch.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt index 51a4e9d6d7..edd8f6463e 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. |