]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'tc/diff-tree-max-depth' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 15 Aug 2025 22:02:44 +0000 (15:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 15 Aug 2025 22:02:45 +0000 (15:02 -0700)
"git diff-tree" learned "--max-depth" option.

* tc/diff-tree-max-depth:
  diff: teach tree-diff a max-depth parameter
  within_depth: fix return for empty path
  combine-diff: zero memory used for callback filepairs

1  2 
Documentation/diff-options.adoc
Makefile
combine-diff.c
diff.c
diff.h
dir.c
t/meson.build

Simple merge
diff --cc Makefile
Simple merge
diff --cc combine-diff.c
Simple merge
diff --cc diff.c
Simple merge
diff --cc diff.h
Simple merge
diff --cc dir.c
Simple merge
diff --cc t/meson.build
Simple merge