X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=Documentation%2Fgit-show-branch.txt;h=e0dce7ec128a178e829c7927603bf456bf4311db;hb=cc1621e2a02ed2a408571ed6f6ba84de2166e334;hp=5103c0c4f909a787e52c26cee4119212f1eb6c19;hpb=7a034337420a45395b3f68a1f12ca53d8b0652be;p=git.git

diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index 5103c0c4..e0dce7ec 100644
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -1,6 +1,5 @@
 git-show-branch(1)
 ==================
-v0.99.5, Aug 2005
 
 NAME
 ----
@@ -8,7 +7,7 @@ git-show-branch - Show branches and their commits.
 
 SYNOPSIS
 --------
-'git show-branch [--all] [--heads] [--tags] [--more=<n>] [--merge-base] <reference>...'
+'git-show-branch [--all] [--heads] [--tags] [--more=<n> | --list | --independent | --merge-base] <reference>...'
 
 DESCRIPTION
 -----------
@@ -29,12 +28,24 @@ OPTIONS
 	Usually the command stops output upon showing the commit
 	that is the common ancestor of all the branches.  This
 	flag tells the command to go <n> more common commits
-	beyond that.
+	beyond that.  When <n> is negative, display only the
+	<reference>s given, without showing the commit ancestry
+	tree.
+
+--list::
+	Synomym to `--more=-1`
 
 --merge-base::
 	Instead of showing the commit list, just act like the
-	'git-merge-base' command except that it can accept more
-	than two heads.
+	'git-merge-base -a' command, except that it can accept
+	more than two heads.
+
+--independent::
+	Among the <reference>s given, display only the ones that
+	cannot be reached from any other <reference>.
+
+Note that --more, --list, --independent and --merge-base options
+are mutually exclusive.
 
 
 OUTPUT
@@ -88,7 +99,7 @@ the name of the branch because it is obvious.
 $ git show-branch --more=4 master
 [master] Add 'git show-branch'.
 [~1] Add a new extended SHA1 syntax <name>~<num>
-[~2] Fix "git-diff-script A B"
+[~2] Fix "git-diff A B"
 [~3] git-ls-files: generalized pathspecs
 [~4] Make "git-ls-files" work in subdirectories
 ------------------------------------------------
@@ -105,4 +116,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite