aboutsummaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-10-18 22:09:03 -0700
committerJunio C Hamano <junkio@cox.net>2006-10-18 22:09:03 -0700
commit65606f3530b2d93eb522fdd1a66970a2b252ae94 (patch)
treea9fe80176bad68ecf66634b7f5d6db36056a1bce /diff.c
parent2dcd3ce8d38101d87c2d329cf46387038ac2c766 (diff)
parentd7014dc0811eb24f418830a30dacc203c1a580f4 (diff)
downloadgit-65606f3530b2d93eb522fdd1a66970a2b252ae94.tar.gz
git-65606f3530b2d93eb522fdd1a66970a2b252ae94.tar.xz
Merge branch 'js/diff'
* js/diff: Turn on recursive with --summary
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/diff.c b/diff.c
index 2dcad1942..33153787b 100644
--- a/diff.c
+++ b/diff.c
@@ -1760,6 +1760,7 @@ int diff_setup_done(struct diff_options *options)
if (options->output_format & (DIFF_FORMAT_PATCH |
DIFF_FORMAT_NUMSTAT |
DIFF_FORMAT_DIFFSTAT |
+ DIFF_FORMAT_SUMMARY |
DIFF_FORMAT_CHECKDIFF))
options->recursive = 1;
/*