]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'kh/format-patch-range-diff-notes' into jch
authorJunio C Hamano <gitster@pobox.com>
Sun, 5 Oct 2025 22:04:16 +0000 (15:04 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 5 Oct 2025 22:04:16 +0000 (15:04 -0700)
"git format-patch --range-diff=... --notes=..." did not drive the
underlying range-diff with correct --notes parameter, ending up
comparing with different set of notes from its main patch output
you would get from "git format-patch --notes=..." for a singleton
patch.

* kh/format-patch-range-diff-notes:
  format-patch: handle range-diff on notes correctly for single patches
  revision: add rdiff_log_arg to rev_info
  range-diff: rename other_arg to log_arg

1  2 
builtin/log.c
builtin/range-diff.c
log-tree.c
revision.h

diff --cc builtin/log.c
Simple merge
Simple merge
diff --cc log-tree.c
Simple merge
diff --cc revision.h
Simple merge