merge script: handle -m --log correctly

diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt
index 125207ef1edad16503545f457bba8525017c8b1a..eedef1bb1a14591d23b1fe6e93da1e3c2be2786b 100644 (file)
--- a/Documentation/git-merge-base.txt
+++ b/Documentation/git-merge-base.txt
@@ -8,7 +8,9 @@ git-merge-base - Find as good common ancestors as possible for a merge
 
 SYNOPSIS
 --------
+[verse]
 'git merge-base' [-a|--all] [--octopus] <commit> <commit>...
+'git merge-base' --independent <commit>...
 
 DESCRIPTION
 -----------
@@ -42,6 +44,13 @@ OPTIONS
        in preparation for an n-way merge.  This mimics the behavior
        of 'git show-branch --merge-base'.
 
+--independent::
+       Instead of printing merge bases, print a minimal subset of
+       the supplied commits with the same ancestors.  In other words,
+       among the commits given, list those which cannot be reached
+       from any other.  This mimics the behavior of 'git show-branch
+       --independent'.
+
 DISCUSSION
 ----------