Merge branch 'jc/pickaxe'

2006-11-07 16:33:59 -08:00
parent 231f240b63 7bd9641df5
commit 24ad8e0ce2
13 changed files with 2093 additions and 4 deletions
--- a/diff.h
+++ b/diff.h
@ -46,6 +46,7 @@ struct diff_options {
 	const char *filter;
 	const char *orderfile;
 	const char *pickaxe;
+	const char *single_follow;
 	unsigned recursive:1,
 		 tree_in_recursive:1,
 		 binary:1,