summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-12-26 22:03:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-12-26 22:03:18 (GMT)
commit3cc3fb7df67dc9c83b71fec82e5bfb1df3724089 (patch)
treeefdba423f81c7c1a5c1e625a626d361a73165020 /diff.h
parent7ad9cec81d86ccf7a693ad7e1218e238aee5ca9d (diff)
parent97bf2a08095197f43b20b3bc1124552ae24d71bf (diff)
downloadgit-3cc3fb7df67dc9c83b71fec82e5bfb1df3724089.zip
git-3cc3fb7df67dc9c83b71fec82e5bfb1df3724089.tar.gz
git-3cc3fb7df67dc9c83b71fec82e5bfb1df3724089.tar.bz2
Merge branch 'jc/1.7.0-diff-whitespace-only-status'
* jc/1.7.0-diff-whitespace-only-status: diff.c: fix typoes in comments Make test case number unique diff: Rename QUIET internal option to QUICK diff: change semantics of "ignore whitespace" options Conflicts: diff.h
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/diff.h b/diff.h
index 15fcecd..6f6d0ed 100644
--- a/diff.h
+++ b/diff.h
@@ -55,7 +55,7 @@ typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
#define DIFF_OPT_COLOR_DIFF (1 << 8)
#define DIFF_OPT_COLOR_DIFF_WORDS (1 << 9)
#define DIFF_OPT_HAS_CHANGES (1 << 10)
-#define DIFF_OPT_QUIET (1 << 11)
+#define DIFF_OPT_QUICK (1 << 11)
#define DIFF_OPT_NO_INDEX (1 << 12)
#define DIFF_OPT_ALLOW_EXTERNAL (1 << 13)
#define DIFF_OPT_EXIT_WITH_STATUS (1 << 14)
@@ -66,7 +66,7 @@ typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
#define DIFF_OPT_DIRSTAT_CUMULATIVE (1 << 19)
#define DIFF_OPT_DIRSTAT_BY_FILE (1 << 20)
#define DIFF_OPT_ALLOW_TEXTCONV (1 << 21)
-
+#define DIFF_OPT_DIFF_FROM_CONTENTS (1 << 22)
#define DIFF_OPT_SUBMODULE_LOG (1 << 23)
#define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)