From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 30 Apr 2021 04:50:26 +0000 (+0900)
Subject: Merge branch 'so/log-diff-merge'
X-Git-Tag: v2.32.0-rc0~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59bb0aa93e6edaca44b2a5488fc915d468bae46f;p=thirdparty%2Fgit.git

Merge branch 'so/log-diff-merge'

"git log" learned "--diff-merges=<style>" option, with an
associated configuration variable log.diffMerges.

* so/log-diff-merge:
  doc/diff-options: document new --diff-merges features
  diff-merges: introduce log.diffMerges config variable
  diff-merges: adapt -m to enable default diff format
  diff-merges: refactor set_diff_merges()
  diff-merges: introduce --diff-merges=on
---

59bb0aa93e6edaca44b2a5488fc915d468bae46f