These patches present a minimal set of changes to turn --diff-merges to require parameter. For now we only introduce --diff-merges=off as synonym for --no-diff-merges. These are on top of jk/log-fp-implies-m "making --first-parent imply -m" by Jeff King, that introduced --[no-]diff-merges as a boolean option to provide ability to override implied -m by --no-diff-merges. Sergey Organov (3): revision: change "--diff-merges" option to require parameter doc/git-log: describe --diff-merges=off t/t4013: add test for --diff-merges=off Documentation/git-log.txt | 6 +- revision.c | 9 ++- t/t4013-diff-various.sh | 1 + ...--diff-merges=off_-p_--first-parent_master | 78 +++++++++++++++++++ 4 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master -- 2.20.1
