зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
8efd2efc32
Коммит
e58142add4
|
@ -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`.
|
||||
|
|
Загрузка…
Ссылка в новой задаче