diff options
author | Junio C Hamano <junkio@cox.net> | 2005-05-19 19:00:36 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-19 22:33:07 -0700 |
commit | 57fe64a40d95dd99d798c6d7c81c1a76d24a8e7c (patch) | |
tree | 8f12e1e6f5bf259b5118dc8cd4a22b23d6c9f32b /diff.h | |
parent | dc26bd890d0a8571c38397e2ab33c0f3963c01a7 (diff) | |
download | git-57fe64a40d95dd99d798c6d7c81c1a76d24a8e7c.tar.gz git-57fe64a40d95dd99d798c6d7c81c1a76d24a8e7c.tar.xz |
[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 <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diff.h')
-rw-r--r-- | diff.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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); |