Skip to content

Commit e58142a

Browse files
sorganovgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 8efd2ef commit e58142a

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

Documentation/rev-list-options.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@ parents) and `--max-parents=-1` (negative numbers denote no upper limit).
130130
this option allows you to ignore the individual commits
131131
brought in to your history by such a merge.
132132

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+
133138
--not::
134139
Reverses the meaning of the '{caret}' prefix (or lack thereof)
135140
for all following revision specifiers, up to the next `--not`.

0 commit comments

Comments
 (0)