This new convenience option requests full diff with respect to first parent, so that git log -d will output diff with respect to first parent for every commit, universally, no matter how many parents the commit turns out to have. It's implemented as pure synonym for --diff-merges=first-parent --patch The first commit in the series tweaks diff-merges documentation a bit, and is valuable by itself. It's put here as '-d' implementation commit depends on it in its documentation part. Note: the need for this new convenience option mostly emerged from denial by the community of patches that modify '-m' behavior to imply '-p' as the rest of similar options (such as --cc) do. Sergey Organov (2): diff-merges: improve --diff-merges documentation diff-merges: introduce '-d' option Documentation/diff-options.txt | 101 +++++++++++++++++++-------------- Documentation/git-log.txt | 4 +- diff-merges.c | 3 + t/t4013-diff-various.sh | 8 +++ 4 files changed, 71 insertions(+), 45 deletions(-) -- 2.25.1
