diff options
| author | Brian Gernhardt <benji@silverinsanity.com> | 2006-12-18 15:48:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-19 00:03:39 (GMT) |
| commit | 38c594d3300b7640532a3716adf5a0778021542c (patch) | |
| tree | 62034a523047935ea8a923290db257809ceb2d44 | |
| parent | b3d9899324af174ff123498b5c7ded3749aac2bc (diff) | |
| download | git-38c594d3300b7640532a3716adf5a0778021542c.zip git-38c594d3300b7640532a3716adf5a0778021542c.tar.gz git-38c594d3300b7640532a3716adf5a0778021542c.tar.bz2 | |
Add documentation for show-branch --topics
Add a quick paragraph explaining the --topics option for show-branch.
The explanation is an abbreviated version of the commit message from
d320a5437f8304cf9ea3ee1898e49d643e005738.
Signed-off-by: Brian Gernhardt <benji@silverinsanity.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | Documentation/git-show-branch.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt index a2445a4..948ff10 100644 --- a/Documentation/git-show-branch.txt +++ b/Documentation/git-show-branch.txt @@ -10,7 +10,7 @@ SYNOPSIS [verse] 'git-show-branch' [--all] [--heads] [--tags] [--topo-order] [--current] [--more=<n> | --list | --independent | --merge-base] - [--no-name | --sha1-name] [<rev> | <glob>]... + [--no-name | --sha1-name] [--topics] [<rev> | <glob>]... DESCRIPTION ----------- @@ -86,6 +86,14 @@ OPTIONS of "master"), name them with the unique prefix of their object names. +--topics:: + Shows only commits that are NOT on the first branch given. + This helps track topic branches by hiding any commit that + is already in the main line of development. When given + "git show-branch --topics master topic1 topic2", this + will show the revisions given by "git rev-list {caret}master + topic1 topic2" + Note that --more, --list, --independent and --merge-base options are mutually exclusive. |