summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-07-13 19:52:35 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-13 20:09:17 (GMT)
commitdda2d79af2d2858b37bab7f6e088d0730c0959d1 (patch)
tree0252e50a800caa678f835ee26193e5f728459f0a /diff.h
parent52f28529f4f90cebdca47f8eacbff5cb20004bed (diff)
downloadgit-dda2d79af2d2858b37bab7f6e088d0730c0959d1.zip
git-dda2d79af2d2858b37bab7f6e088d0730c0959d1.tar.gz
git-dda2d79af2d2858b37bab7f6e088d0730c0959d1.tar.bz2
[PATCH] Clean up diff option descriptions.
I got tired of maintaining almost duplicated descriptions in diff-* brothers, both in usage string and documentation. 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.h20
1 files changed, 20 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index 46c0e23..9f9ca8b 100644
--- a/diff.h
+++ b/diff.h
@@ -53,6 +53,26 @@ 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