path: root/show-diff.c
diff options
authorJunio C Hamano <>2005-04-26 01:26:45 (GMT)
committerLinus Torvalds <>2005-04-26 01:26:45 (GMT)
commitd1df5743809614241883ecad51876607cf432034 (patch)
treeb49d0923200e1a1e765e88b044ed3c90100f8465 /show-diff.c
parent86436c28289eedd2ee9b7f9c872a0ed039866a0f (diff)
[PATCH] Introduce diff-tree-helper.
This patch introduces a new program, diff-tree-helper. It reads output from diff-cache and diff-tree, and produces a patch file. The diff format customization can be done the same way the show-diff uses; the same external diff interface introduced by the previous patch to drive diff from show-diff is used so this is not surprising. It is used like the following examples: $ diff-cache --cached -z <tree> | diff-tree-helper -z -R paths... $ diff-tree -r -z <tree1> <tree2> | diff-tree-helper -z paths... - As usual, the use of the -z flag is recommended in the script to pass NUL-terminated filenames through the pipe between commands. - The -R flag is used to generate reverse diff. It does not matter for diff-tree case, but it is sometimes useful to get a patch in the desired direction out of diff-cache. - The paths parameters are used to restrict the paths that appears in the output. Again this is useful to use with diff-cache, which, unlike diff-tree, does not take such paths restriction parameters. Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'show-diff.c')
0 files changed, 0 insertions, 0 deletions