doc/rev-list-options: document --first-parent changes merges format

After introduction of the --diff-merges=first-parent, the
--first-parent sets the default format for merges to the same value as
this new option. Document this behavior and add corresponding
reference to --diff-merges.

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 002379056a072cb87f7c65bbcaedaa4ebed7387a..96cc89d157d21f0cbf9cee35db0c49bc4cb18dae 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -130,6 +130,11 @@ parents) and `--max-parents=-1` (negative numbers denote no upper limit).
        this option allows you to ignore the individual commits
        brought in to your history by such a merge.
 
+ifdef::git-log[]
+       This option also changes default diff format for merge commits
+       to `first-parent`, see `--diff-merges=first-parent` for details.
+endif::git-log[]
+
 --not::
        Reverses the meaning of the '{caret}' prefix (or lack thereof)
        for all following revision specifiers, up to the next `--not`.