git log -p -m: document -m and honor --first-parent

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 3ef71179d9b234733e392a36cae8aa37be6235b0..39a064b53354d162ab0820c4af293182b9ad997b 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -108,8 +108,8 @@ options may be given. See linkgit:git-diff-files[1] for more options.
 
 -c::
 
-       This flag changes the way a merge commit is displayed.  It shows
-       the differences from each of the parents to the merge result
+       With this option, diff output for a merge commit
+       shows the differences from each of the parents to the merge result
        simultaneously instead of showing pairwise diff between a parent
        and the result one at a time. Furthermore, it lists only files
        which were modified from all parents.
@@ -121,6 +121,15 @@ options may be given. See linkgit:git-diff-files[1] for more options.
        the parents have only two variants and the merge result picks
        one of them without modification.
 
+-m::
+
+       This flag makes the merge commits show the full diff like
+       regular commits; for each merge parent, a separate log entry
+       and diff is generated. An exception is that only diff against
+       the first parent is shown when '--first-parent' option is given;
+       in that case, the output represents the changes the merge
+       brought _into_ the then-current branch.
+
 -r::
 
        Show recursive diffs.
@@ -233,27 +242,27 @@ endif::git-rev-list[]
        Pretend as if all the refs in `$GIT_DIR/refs/heads` are listed
        on the command line as '<commit>'. If `pattern` is given, limit
        branches to ones matching given shell glob. If pattern lacks '?',
-       '*', or '[', '/*' at the end is impiled.
+       '*', or '[', '/*' at the end is implied.
 
 --tags[=pattern]::
 
        Pretend as if all the refs in `$GIT_DIR/refs/tags` are listed
        on the command line as '<commit>'. If `pattern` is given, limit
        tags to ones matching given shell glob. If pattern lacks '?', '*',
-       or '[', '/*' at the end is impiled.
+       or '[', '/*' at the end is implied.
 
 --remotes[=pattern]::
 
        Pretend as if all the refs in `$GIT_DIR/refs/remotes` are listed
        on the command line as '<commit>'. If `pattern`is given, limit
        remote tracking branches to ones matching given shell glob.
-       If pattern lacks '?', '*', or '[', '/*' at the end is impiled.
+       If pattern lacks '?', '*', or '[', '/*' at the end is implied.
 
 --glob=glob-pattern::
        Pretend as if all the refs matching shell glob `glob-pattern`
        are listed on the command line as '<commit>'. Leading 'refs/',
        is automatically prepended if missing. If pattern lacks '?', '*',
-       or '[', '/*' at the end is impiled.
+       or '[', '/*' at the end is implied.
 
 
 ifndef::git-rev-list[]