mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

doc/git-log: describe --diff-merges=off

Browse Source 
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Sergey Organov
2020-08-06 01:08:31 +03:00
committed by Junio C Hamano
parent 6501580ff8
commit 405a2fdf99
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/git-log.txt
View File

@ -145,7 +145,6 @@ combined-diff option or with `--no-diff-merges`).
rename or copy detection have been requested). rename or copy detection have been requested).
-m:: -m::
--diff-merges::
This flag makes the merge commits show the full diff like This flag makes the merge commits show the full diff like
regular commits; for each merge parent, a separate log entry regular commits; for each merge parent, a separate log entry
and diff is generated. An exception is that only diff against and diff is generated. An exception is that only diff against
@ -153,6 +152,11 @@ combined-diff option or with `--no-diff-merges`).
in that case, the output represents the changes the merge in that case, the output represents the changes the merge
brought _into_ the then-current branch. brought _into_ the then-current branch.
--diff-merges=off::
--no-diff-merges::
Disable output of diffs for merge commits (default). Useful to
override `-m`, `-c`, or `--cc`.
:git-log: 1 :git-log: 1
include::diff-options.txt[] include::diff-options.txt[]