]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'dl/diff-merge-base'
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Jul 2021 20:17:59 +0000 (13:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Jul 2021 20:17:59 +0000 (13:17 -0700)
"git diff --merge-base" documentation has been updated.

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

1  2 
builtin/diff.c

diff --cc builtin/diff.c
Simple merge