From 57fe64a40d95dd99d798c6d7c81c1a76d24a8e7c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 19 May 2005 19:00:36 -0700 Subject: [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 suggestion made by Linus has been implemented. Documentation updates are also included. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds --- diff.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'diff.h') diff --git a/diff.h b/diff.h index cce46491bf..86a645afee 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); -- cgit v1.2.3