aboutsummaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-06-03 01:36:43 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-03 11:23:03 -0700
commitce24067549a8554b214e723d7aa4bc063c54409e (patch)
tree3dfaf2756f55a43a2e87092550cdc5dab4c82e9b /diff.h
parent355e76a4a3c5e49ae15a642806457bce10fe2ef4 (diff)
downloadgit-ce24067549a8554b214e723d7aa4bc063c54409e.tar.gz
git-ce24067549a8554b214e723d7aa4bc063c54409e.tar.xz
[PATCH] diff: Fix docs and add -O to diff-helper.
This patch updates diff documentation and usage strings: - clarify the semantics of -R. It is not "output in reverse"; rather, it is "I will feed diff backwards". Semantically they are different when -C is involved. - describe -O in usage strings of diff-* brothers. It was implemented, documented but not described in usage text. Also it adds -O to diff-helper. Like -S (and unlike -M/-C/-B), this option can work on sanitized diff-raw output produced by the diff-* brothers. While we are at it, the call it makes to diffcore is cleaned up to use the diffcore_std() like everybody else, and the declaration for the low level diffcore routines are moved from diff.h (public) to diffcore.h (private between diff.c and diffcore backends). 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.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/diff.h b/diff.h
index 3fcf7010e..c64880cdb 100644
--- a/diff.h
+++ b/diff.h
@@ -35,21 +35,13 @@ extern int diff_scoreopt_parse(const char *opt);
#define DIFF_SETUP_REVERSE 1
#define DIFF_SETUP_USE_CACHE 2
#define DIFF_SETUP_USE_SIZE_CACHE 4
+
extern void diff_setup(int flags);
#define DIFF_DETECT_RENAME 1
#define DIFF_DETECT_COPY 2
-extern void diffcore_rename(int rename_copy, int minimum_score);
-
#define DIFF_PICKAXE_ALL 1
-extern void diffcore_pickaxe(const char *needle, int opts);
-
-extern void diffcore_pathspec(const char **pathspec);
-
-extern void diffcore_order(const char *orderfile);
-
-extern void diffcore_break(int max_score);
extern void diffcore_std(const char **paths,
int detect_rename, int rename_score,