Merge branch 'ct/diff-with-merge-base-clarification' into master
authorJunio C Hamano <redacted>
Wed, 15 Jul 2020 23:29:44 +0000 (16:29 -0700)
committerJunio C Hamano <redacted>
Wed, 15 Jul 2020 23:29:44 +0000 (16:29 -0700)
Doc update.

* ct/diff-with-merge-base-clarification:
  git-diff.txt: reorder possible usages
  git-diff.txt: don't mark required argument as optional


Trivial merge
git clone https://git.99rst.org/PROJECT