Restructure documentation for git-merge-base.

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 6d40f0011b0fd297e5676c8479e46989d7f47696..c43aa438c7ee3a937036df805aba0cdf5a9e60dd 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -25,6 +25,7 @@ OPTIONS
 
 -<n>::
        Limits the number of commits to show.
+       Note that this is a commit limiting option, see below.
 
 <since>..<until>::
        Show only commits between the named two commits.  When
@@ -72,16 +73,16 @@ produced by --stat etc.
        to be prefixed with "\-- " to separate them from options or
        refnames.
 
+include::rev-list-options.txt[]
+
+include::pretty-formats.txt[]
+
 Common diff options
-~~~~~~~~~~~~~~~~~~~
+-------------------
 
 :git-log: 1
 include::diff-options.txt[]
 
-include::rev-list-options.txt[]
-
-include::pretty-formats.txt[]
-
 include::diff-generate-patch.txt[]
 
 Examples
@@ -116,7 +117,7 @@ git log --follow builtin-rev-list.c::
 git log --branches --not --remotes=origin::
 
        Shows all commits that are in any of local branches but not in
-       any of remote tracking branches for 'origin' (what you have that
+       any of remote-tracking branches for 'origin' (what you have that
        origin doesn't).
 
 git log master --not --remotes=*/master::