From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Jul 2020 23:29:44 +0000 (-0700)
Subject: Merge branch 'ct/diff-with-merge-base-clarification' into master
X-Git-Tag: v2.28.0-rc1~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1863dbdde9dfcea3c51940cc106b699dedbebff8;p=thirdparty%2Fgit.git

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
---

1863dbdde9dfcea3c51940cc106b699dedbebff8