Merge branch 'ct/diff-with-merge-base-clarification' into master
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Jul 2020 23:29:44 +0000 (16:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Jul 2020 23:29:44 +0000 (16:29 -0700)
commit1863dbdde9dfcea3c51940cc106b699dedbebff8
tree045f5411d2fa96f810aa11e1c4f93176644a4142
parent12f5eb9f082d7f4cb083a11aa59ac8bbd5e1589a
parent78b76d310f3e9c0cc1e990ed93f58711e48d9ab2
Merge branch 'ct/diff-with-merge-base-clarification' into master

Doc update.

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