Merge branch 'fixes'

diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index 71d5ba8fd78dfbbdefde52f3b1bae73a0e52e50b..5b80d5aa2a7a8c58bd525563996184f1100506c5 100644 (file)
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -1,6 +1,6 @@
 git-show-branch(1)
 ==================
-v0.99.4, Aug 2005
+v0.99.5, Aug 2005
 
 NAME
 ----
@@ -8,7 +8,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
 -----------
@@ -28,12 +28,25 @@ OPTIONS
 --more=<n>::
        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> commits beyond that.
+       flag tells the command to go <n> more common commits
+       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
@@ -87,7 +100,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
 ------------------------------------------------
@@ -104,4 +117,4 @@ Documentation by Junio C Hamano.
 
 GIT
 ---
-Part of the link:git.html[git] suite
+Part of the gitlink:git[7] suite