]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'mm/line-log-use-standard-diff-output' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Apr 2026 04:36:32 +0000 (21:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Apr 2026 04:36:32 +0000 (21:36 -0700)
commit724e6526dc85bce8c8913d101dee2a91d4c4f492
tree6901d97f6f5212ab38b87d82da1debcd9d3dbc3e
parent189a785ab595218b95d2e09937b96fbd752f5d80
parent512536a09ea2964e93226f219898ee0a09d85a70
Merge branch 'mm/line-log-use-standard-diff-output' into next

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
diff.c
revision.c