Sergey Organov <sorganov@xxxxxxxxx> writes: > Junio C Hamano <gitster@xxxxxxxxx> writes: > >> Sergey Organov <sorganov@xxxxxxxxx> writes: >> >>> Signed-off-by: Sergey Organov <sorganov@xxxxxxxxx> >>> --- >>> t/t4013-diff-various.sh | 1 + >>> ...--diff-merges=off_-p_--first-parent_master | 78 +++++++++++++++++++ >>> 2 files changed, 79 insertions(+) >>> create mode 100644 >>> t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master >>> >>> diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh >>> index 40e222c94520..86fb11cecc61 100755 >>> --- a/t/t4013-diff-various.sh >>> +++ b/t/t4013-diff-various.sh >>> @@ -298,6 +298,7 @@ log --root -c --patch-with-stat --summary master >>> # improved by Timo's patch >>> log --root --cc --patch-with-stat --summary master >>> log --no-diff-merges -p --first-parent master >>> +log --diff-merges=off -p --first-parent master >> >> I think we want to also test it in a different order, e.g. >> >> log --first-parent --diff-merges=off -p master > > Dunno, why original Jeff series didn't need > > log --first-parent --no-diff-merges -p master > > then? Who said it didn't need it?
