Jonathan Nieder <jrnieder@xxxxxxxxx> writes: > Hi Sergey, > > Sergey Organov wrote: > >> Fix long standing inconsistency between -c/--cc that do imply -p on >> one side, and -m that did not imply -p on the other side. > > As I mentioned before, I quite like this change for interactive use. > > But: > > [...] >> It's also worth to be noticed that exact historical semantics of -m is >> still provided by --diff-merges=separate. > > Is that true? When I try it locally, -m shows no diff by default, > whereas --diff-merges=separate shows a diff for merges. You are right, it's not true that --diff-merges=separate behaves exactly like -m did before this commit. Actually, I think this notice was meant to be referring to the "It gets even more useful if one sets "log.diffMerges" configuration variable to "first-parent" to force -m produce usual diff with respect to first parent only." part of the message when I wrote it, but it ends up being confusing and thus wrong, sorry. Thanks, -- Sergey Organov
