bekucera/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-09-10 22:44:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jt/diff-pairs'

Browse Source 
A post-processing filter for "diff --raw" output has been
introduced.

* jt/diff-pairs:
  builtin/diff-pairs: allow explicit diff queue flush
  builtin: introduce diff-pairs command
  diff: add option to skip resolving diff statuses
  diff: return diff_filepair from diff queue helpers
This commit is contained in:
Junio C Hamano
2025-03-26 16:26:09 +09:00
parent 683c54c999 cf15095ec5
commit f50df872a4
13 changed files with 449 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@@ -1242,6 +1242,7 @@ BUILTIN_OBJS += builtin/describe.o
BUILTIN_OBJS += builtin/diagnose.o
BUILTIN_OBJS += builtin/diff-files.o
BUILTIN_OBJS += builtin/diff-index.o
BUILTIN_OBJS += builtin/diff-pairs.o
BUILTIN_OBJS += builtin/diff-tree.o
BUILTIN_OBJS += builtin/diff.o
BUILTIN_OBJS += builtin/difftool.o