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>
Sergey Organov committed
Dec 21, 2020 at 18:19 UTC
e58142add40e0db354eaed9554d1b0c871e23f7d
1 file changed
+5
Documentation/rev-list-options.txt
+5
@@ -130,6 +130,11 @@ parents) and `--max-parents=-1` (negative numbers denote no upper limit).
130
this option allows you to ignore the individual commits
131
brought in to your history by such a merge.
132
133
+ifdef::git-log[]
134
+ This option also changes default diff format for merge commits
135
+ to `first-parent`, see `--diff-merges=first-parent` for details.
136
+endif::git-log[]
137
+
138
--not::
139
Reverses the meaning of the '{caret}' prefix (or lack thereof)
140
for all following revision specifiers, up to the next `--not`.