X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.h;h=e0a3207a62eab9c72d74e3b15cfae660fbcdaa66;hb=ec3f5a46eae8dd36995ff4709360417b55bc2d7d;hp=9f0852d321bbed548fa57b5afdc3aad25c1dd943;hpb=85c1f337be49eaa9a22e42a1c9958deef5ab57c3;p=git.git

diff --git a/diff.h b/diff.h
index 9f0852d3..e0a3207a 100644
--- a/diff.h
+++ b/diff.h
@@ -53,13 +53,33 @@ extern void diffcore_std_no_resolve(const char **paths,
 				    const char *pickaxe, int pickaxe_opts,
 				    const char *orderfile, const char *filter);
 
+#define COMMON_DIFF_OPTIONS_HELP \
+"\ncommon diff options:\n" \
+"  -r		diff recursively (only meaningful in diff-tree)\n" \
+"  -z		output diff-raw with lines terminated with NUL.\n" \
+"  -p		output patch format.\n" \
+"  -u		synonym for -p.\n" \
+"  --name-only	show only names of changed files.\n" \
+"  --name-only-z\n" \
+"		same as --name-only but terminate lines with NUL.\n" \
+"  -R		swap input file pairs.\n" \
+"  -B		detect complete rewrites.\n" \
+"  -M		detect renames.\n" \
+"  -C		detect copies.\n" \
+"  --find-copies-harder\n" \
+"		try unchanged files as candidate for copy detection.\n" \
+"  -O<file>	reorder diffs according to the <file>.\n" \
+"  -S<string>	find filepair whose only one side contains the string.\n" \
+"  --pickaxe-all\n" \
+"		show all files diff when -S is used and hit is found.\n"
+
 extern int diff_queue_is_empty(void);
 
-#define DIFF_FORMAT_HUMAN	0
-#define DIFF_FORMAT_MACHINE	1
+#define DIFF_FORMAT_RAW		1
 #define DIFF_FORMAT_PATCH	2
 #define DIFF_FORMAT_NO_OUTPUT	3
+#define DIFF_FORMAT_NAME	4
 
-extern void diff_flush(int output_style);
+extern void diff_flush(int output_style, int line_terminator);
 
 #endif /* DIFF_H */