From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 28 Jul 2021 20:17:59 +0000 (-0700)
Subject: Merge branch 'dl/diff-merge-base'
X-Git-Tag: v2.33.0-rc0~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ca224f1560ec43973e0f1c76bc8ef487a6e107b;p=thirdparty%2Fgit.git

Merge branch 'dl/diff-merge-base'

"git diff --merge-base" documentation has been updated.

* dl/diff-merge-base:
  git-diff: fix missing --merge-base docs
---

6ca224f1560ec43973e0f1c76bc8ef487a6e107b