path: root/diff.h
diff options
authorJunio C Hamano <>2005-06-12 03:57:13 (GMT)
committerLinus Torvalds <>2005-06-13 03:40:20 (GMT)
commitf2ce9fde57513af026e0641073a6781a086251d5 (patch)
tree5a6e33c33717880fc6af64af378bb373bdf8e065 /diff.h
parenta7ca65405c364e674cf4359b07ae959d4ece01ab (diff)
[PATCH] Add --diff-filter= output restriction to diff-* family.
This is a halfway between debugging aid and a helper to write an ultra-smart merge scripts. The new option takes a string that consists of a list of "status" letters, and limits the diff output to only those classes of changes, with two exceptions: - A broken pair (aka "complete rewrite"), does not match D (deleted) or N (created). Use B to look for them. - The letter "A" in the diff-filter string does not match anything itself, but causes the entire diff that contains selected patches to be output (this behaviour is similar to that of --pickaxe-all for the -S option). For example, $ git-rev-list HEAD | git-diff-tree --stdin -s -v -B -C --diff-filter=BCR shows a list of commits that have complete rewrite, copy, or rename. Signed-off-by: Junio C Hamano <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'diff.h')
1 files changed, 6 insertions, 2 deletions
diff --git a/diff.h b/diff.h
index c64880c..9f0852d 100644
--- a/diff.h
+++ b/diff.h
@@ -47,7 +47,11 @@ extern void diffcore_std(const char **paths,
int detect_rename, int rename_score,
const char *pickaxe, int pickaxe_opts,
int break_opt,
- const char *orderfile);
+ const char *orderfile, const char *filter);
+extern void diffcore_std_no_resolve(const char **paths,
+ const char *pickaxe, int pickaxe_opts,
+ const char *orderfile, const char *filter);
extern int diff_queue_is_empty(void);
@@ -56,6 +60,6 @@ extern int diff_queue_is_empty(void);
-extern void diff_flush(int output_style, int resolve_rename_copy);
+extern void diff_flush(int output_style);
#endif /* DIFF_H */