Merge branch 'eb/doc-log-manpage'

* eb/doc-log-manpage:
Reorganize `git-log' man page to clarify common diff options.

diff --combined Documentation/git-log.txt
index 8a69647f5c36979daea537f20cab6f02875ff619,c925d3675af78e0bce7840a8fef28567d72e4695..e970664fe1a47c3f35f0f7c60b6c8f9781caed31
--- 1/Documentation/git-log.txt
--- 2/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@@ -23,9 -23,6 +23,6 @@@ each commit introduces are shown
  OPTIONS
  -------
  
- :git-log: 1
- include::diff-options.txt[]
- 
  -<n>::
        Limits the number of commits to show.
  
@@@ -34,8 -31,13 +31,12 @@@
        either <since> or <until> is omitted, it defaults to
        `HEAD`, i.e. the tip of the current branch.
        For a more complete list of ways to spell <since>
 -      and <until>, see "SPECIFYING REVISIONS" section in
 -      linkgit:git-rev-parse[1].
 +      and <until>, see linkgit:gitrevisions[1].
  
+ --follow::
+       Continue listing the history of a file beyond renames
+       (works only for a single file).
+ 
  --no-decorate::
  --decorate[=short|full|no]::
        Print out the ref names of any commits that are shown. If 'short' is
@@@ -55,9 -57,6 +56,6 @@@
        the specified paths; this means that "<path>..." limits only
        commits, and doesn't limit diff for those commits.
  
- --follow::
-       Continue listing the history of a file beyond renames/copies.
- 
  --log-size::
        Before the log message print out its size in bytes. Intended
        mainly for porcelain tools consumption. If git is unable to
@@@ -71,6 -70,11 +69,11 @@@
        to be prefixed with "\-- " to separate them from options or
        refnames.
  
+ Common diff options
+ ~~~~~~~~~~~~~~~~~~~
+ 
+ :git-log: 1
+ include::diff-options.txt[]
  
  include::rev-list-options.txt[]