Merge branch 'ct/diff-with-merge-base-clarification'
commit1457886ce2004c49661c8769f3a5246f6a340c8d
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Jun 2020 19:27:46 +0000 (25 12:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Jun 2020 19:27:46 +0000 (25 12:27 -0700)
tree310d11ddd9a443240287edb3370f0ba3ae47e67d
parent53674699c0b40c99094858d0c174e8ff0a162a8d
parentb7e10b2ca210d6a3647910fdecea33581e4eaf0d
Merge branch 'ct/diff-with-merge-base-clarification'

"git diff" used to take arguments in random and nonsense range
notation, e.g. "git diff A..B C", "git diff A..B C...D", etc.,
which has been cleaned up.

* ct/diff-with-merge-base-clarification:
  Documentation: usage for diff combined commits
  git diff: improve range handling
  t/t3430: avoid undefined git diff behavior
builtin/diff.c