path: root/diffcore.h
diff options
authorJunio C Hamano <>2005-06-03 08:36:43 (GMT)
committerLinus Torvalds <>2005-06-03 18:23:03 (GMT)
commitce24067549a8554b214e723d7aa4bc063c54409e (patch)
tree3dfaf2756f55a43a2e87092550cdc5dab4c82e9b /diffcore.h
parent355e76a4a3c5e49ae15a642806457bce10fe2ef4 (diff)
[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 <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'diffcore.h')
1 files changed, 6 insertions, 0 deletions
diff --git a/diffcore.h b/diffcore.h
index 1f4b32c..2e613eb 100644
--- a/diffcore.h
+++ b/diffcore.h
@@ -73,6 +73,12 @@ extern struct diff_filepair *diff_queue(struct diff_queue_struct *,
struct diff_filespec *);
extern void diff_q(struct diff_queue_struct *, struct diff_filepair *);
+extern void diffcore_pathspec(const char **pathspec);
+extern void diffcore_break(int);
+extern void diffcore_rename(int rename_copy, int);
+extern void diffcore_pickaxe(const char *needle, int opts);
+extern void diffcore_order(const char *orderfile);
#define DIFF_DEBUG 0
void diff_debug_filespec(struct diff_filespec *, int, const char *);