From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 7 Apr 2026 21:59:27 +0000 (-0700)
Subject: Merge branch 'mm/line-log-use-standard-diff-output'
X-Git-Tag: v2.54.0-rc1~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1678b7de977043f31242d2029259797eee620236;p=thirdparty%2Fgit.git

Merge branch 'mm/line-log-use-standard-diff-output'

The way the "git log -L<range>:<file>" feature is bolted onto the
log/diff machinery is being reworked a bit to make the feature
compatible with more diff options, like -S/G.

* mm/line-log-use-standard-diff-output:
  doc: note that -L supports patch formatting and pickaxe options
  t4211: add tests for -L with standard diff options
  line-log: route -L output through the standard diff pipeline
  line-log: fix crash when combined with pickaxe options
---

1678b7de977043f31242d2029259797eee620236