path: root/diff.h
diff options
authorJunio C Hamano <>2005-05-20 02:00:36 (GMT)
committerLinus Torvalds <>2005-05-20 05:33:07 (GMT)
commit57fe64a40d95dd99d798c6d7c81c1a76d24a8e7c (patch)
tree8f12e1e6f5bf259b5118dc8cd4a22b23d6c9f32b /diff.h
parentdc26bd890d0a8571c38397e2ab33c0f3963c01a7 (diff)
[PATCH] diff overhaul
This cleans up the way calls are made into the diff core from diff-tree family and diff-helper. Earlier, these programs had "if (generating_patch)" sprinkled all over the place, but those ugliness are gone and handled uniformly from the diff core, even when not generating patch format. This also allowed diff-cache and diff-files to acquire -R (reverse) option to generate diff in reverse. Users of diff-tree can swap two trees easily so I did not add -R there. [ Linus' note: I'll add -R to "diff-tree" too, since a "commit diff" doesn't have another tree to switch around: the other tree is always the parent(s) of the commit ] Also -M<digits-as-mantissa> suggestion made by Linus has been implemented. Documentation updates are also included. Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'diff.h')
1 files changed, 3 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index cce4649..86a645a 100644
--- a/diff.h
+++ b/diff.h
@@ -17,8 +17,10 @@ extern void diff_change(unsigned mode1, unsigned mode2,
extern void diff_unmerge(const char *path);
+extern int diff_scoreopt_parse(const char *opt);
extern void diff_setup(int detect_rename, int minimum_score,
- int reverse,
+ int reverse, int raw_output,
const char **spec, int cnt);
extern void diff_flush(void);