summaryrefslogtreecommitdiff
path: root/revision.c
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 /revision.c
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 'revision.c')
-rw-r--r--revision.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/revision.c b/revision.c
index a8a3c3a..25fa14d 100644
--- a/revision.c
+++ b/revision.c
@@ -791,7 +791,7 @@ void init_revisions(struct rev_info *revs, const char *prefix)
revs->ignore_merges = 1;
revs->simplify_history = 1;
DIFF_OPT_SET(&revs->pruning, RECURSIVE);
- DIFF_OPT_SET(&revs->pruning, QUIET);
+ DIFF_OPT_SET(&revs->pruning, QUICK);
revs->pruning.add_remove = file_add_remove;
revs->pruning.change = file_change;
revs->lifo = 1;