Merge branch 'so/diff-merges-dd'
commit755fb09163ec71b784b1bd9db5cb73de7a01d078
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Oct 2023 20:56:37 +0000 (23 13:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Oct 2023 20:56:37 +0000 (23 13:56 -0700)
treec163b5e33e21a4151495361f6be975d7a3477dce
parentf32af12ceec1c19d8a8a7874523d3a7ceef6eebf
parent7c446ac7903555356d66e24dca5e370f0e1158bc
Merge branch 'so/diff-merges-dd'

"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