]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'so/diff-merges-dd'
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Oct 2023 20:56:37 +0000 (13:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Oct 2023 20:56:37 +0000 (13:56 -0700)
"git log" and friends learned "--dd" that is a short-hand for
"--diff-merges=first-parent -p".

* so/diff-merges-dd:
  completion: complete '--dd'
  diff-merges: introduce '--dd' option
  diff-merges: improve --diff-merges documentation


Trivial merge