mirror of
https://github.com/git/git
synced 2024-10-03 23:29:36 +00:00
Merge branch 'js/diff'
* js/diff: Turn on recursive with --summary
This commit is contained in:
commit
65606f3530
1
diff.c
1
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;
|
||||
/*
|
||||
|
|
|
@ -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
|
||||
$
|
||||
|
|
Loading…
Reference in a new issue