]> Kevux Git Server - rit/commit
Merge branch 'mm/line-log-use-standard-diff-output'
authorJunio C Hamano <gitster@pobox.com>
Tue, 7 Apr 2026 21:59:27 +0000 (14:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 7 Apr 2026 21:59:27 +0000 (14:59 -0700)
commit1678b7de977043f31242d2029259797eee620236
tree749d1f5c103743b03ab9862d34e104deae16f397
parentfb5516997ef3f882d8e53ce70ba6077533683621
parent512536a09ea2964e93226f219898ee0a09d85a70
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
diff.c
revision.c