From 38c594d3300b7640532a3716adf5a0778021542c Mon Sep 17 00:00:00 2001 From: Brian Gernhardt Date: Mon, 18 Dec 2006 10:48:33 -0500 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- Documentation/git-show-branch.txt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt index a2445a48f..948ff10e6 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= | --list | --independent | --merge-base] - [--no-name | --sha1-name] [ | ]... + [--no-name | --sha1-name] [--topics] [ | ]... 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. -- 2.26.2