diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-18 22:09:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-18 22:09:03 -0700 |
| commit | 65606f3530b2d93eb522fdd1a66970a2b252ae94 (patch) | |
| tree | a9fe80176bad68ecf66634b7f5d6db36056a1bce | |
| parent | 2dcd3ce8d38101d87c2d329cf46387038ac2c766 (diff) | |
| parent | d7014dc0811eb24f418830a30dacc203c1a580f4 (diff) | |
| download | git-65606f3530b2d93eb522fdd1a66970a2b252ae94.tar.gz git-65606f3530b2d93eb522fdd1a66970a2b252ae94.tar.xz | |
Merge branch 'js/diff'
* js/diff:
Turn on recursive with --summary
| -rw-r--r-- | diff.c | 1 | ||||
| -rw-r--r-- | t/t4013/diff.diff-tree_--pretty_--root_--summary_initial | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -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; /* diff --git a/t/t4013/diff.diff-tree_--pretty_--root_--summary_initial b/t/t4013/diff.diff-tree_--pretty_--root_--summary_initial index ea4820553..58e5f74ae 100644 --- a/t/t4013/diff.diff-tree_--pretty_--root_--summary_initial +++ b/t/t4013/diff.diff-tree_--pretty_--root_--summary_initial @@ -5,7 +5,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000 Initial - create mode 040000 dir + create mode 100644 dir/sub create mode 100644 file0 create mode 100644 file2 $ |