summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-08 19:15:52 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-08 19:15:52 (GMT)
commit2f0f8b71ee45bcf91c2de480474a26030596fe3c (patch)
tree11a018cb02c52f3d18a8ca7fa7f6625303ab8e75 /Documentation
parent35ef3a4c63d6b60cda8f26c842c0efee8d2cb5cc (diff)
downloadgit-2f0f8b71ee45bcf91c2de480474a26030596fe3c.zip
git-2f0f8b71ee45bcf91c2de480474a26030596fe3c.tar.gz
git-2f0f8b71ee45bcf91c2de480474a26030596fe3c.tar.bz2
Show all merge-base candidates from show-branch --merge-base
This would make things easier to use for Octopus. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-show-branch.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index c947fce..cc7da30 100644
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -33,8 +33,8 @@ OPTIONS
--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.
OUTPUT