summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-30 07:09:07 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-31 01:10:46 (GMT)
commitaf5323e0274fad058f13949b89a9191a7bef7e38 (patch)
tree6bf28a92074958605af6e31e46bf12bbaef6f726 /diff.h
parent2036d841020b7500eca7d568bd0c353b4fe73408 (diff)
downloadgit-af5323e0274fad058f13949b89a9191a7bef7e38.zip
git-af5323e0274fad058f13949b89a9191a7bef7e38.tar.gz
git-af5323e0274fad058f13949b89a9191a7bef7e38.tar.bz2
[PATCH] Add -O<orderfile> option to diff-* brothers.
A new diffcore filter diffcore-order is introduced. This takes a text file each of whose line is a shell glob pattern. Patches that match a glob pattern on an earlier line in the file are output before patches that match a later line, and patches that do not match any glob pattern are output last. A typical orderfile for git project probably should look like this: README Makefile Documentation *.h *.c 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.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/diff.h b/diff.h
index ef0dfe2..0f1ed58 100644
--- a/diff.h
+++ b/diff.h
@@ -43,12 +43,15 @@ extern void diffcore_pickaxe(const char *needle, int opts);
extern void diffcore_pathspec(const char **pathspec);
-extern void diffcore_break(int);
+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,
const char *pickaxe, int pickaxe_opts,
- int break_opt);
+ int break_opt,
+ const char *orderfile);
extern int diff_queue_is_empty(void);