Merge branch 'maint-1.6.4' into maint-1.6.5

[git.git] / Documentation / git-merge-base.txt

diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt
index 00e400353c5bfe1d6f4a75b5bf2dee9d7eca21bc..ce5b369985c254ec5d986aa3dd250828cf3cc4cb 100644 (file)
--- a/Documentation/git-merge-base.txt
+++ b/Documentation/git-merge-base.txt
@@ -27,6 +27,10 @@ commits on the command line.  As the most common special case, specifying only
 two commits on the command line means computing the merge base between
 the given two commits.
 
+As a consequence, the 'merge base' is not necessarily contained in each of the
+commit arguments if more than two commits are specified. This is different
+from linkgit:git-show-branch[1] when used with the `--merge-base` option.
+
 OPTIONS
 -------
 -a::