diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-05 16:31:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-05 16:31:24 -0700 |
| commit | 0c926a3d9c34396636c2fea7a0cd5a4200ea298b (patch) | |
| tree | 1d2c0c87f3f7fe20b20290970c04d7cc7d0a16d2 /t/t4013/diff.diff-tree_-c_master | |
| parent | 169c2e9d1e81b3e7129248d89de160a7bb242411 (diff) | |
| parent | 047fbe906b375e8a3a7564ad0e4443f62dd528a2 (diff) | |
| download | git-0c926a3d9c34396636c2fea7a0cd5a4200ea298b.tar.gz | |
Merge branch 'th/diff'
* th/diff:
builtin-diff: turn recursive on when defaulting to --patch format.
t4013: note improvements brought by the new output code.
t4013: add format-patch tests.
format-patch: fix diff format option implementation
combine-diff.c: type sanity.
t4013 test updates for new output code.
Fix some more diff options changes.
Fix diff-tree -s
log --raw: Don't descend into subdirectories by default
diff-tree: Use ---\n as a message separator
Print empty line between raw, stat, summary and patch
t4013: add more tests around -c and --cc
whatchanged: Default to DIFF_FORMAT_RAW
Don't xcalloc() struct diffstat_t
Add msg_sep to diff_options
DIFF_FORMAT_RAW is not default anymore
Set default diff output format after parsing command line
Make --raw option available for all diff commands
Merge with_raw, with_stat and summary variables to output_format
t4013: add tests for diff/log family output options.
Diffstat (limited to 't/t4013/diff.diff-tree_-c_master')
| -rw-r--r-- | t/t4013/diff.diff-tree_-c_master | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t4013/diff.diff-tree_-c_master b/t/t4013/diff.diff-tree_-c_master new file mode 100644 index 0000000000..c258efe222 --- /dev/null +++ b/t/t4013/diff.diff-tree_-c_master @@ -0,0 +1,5 @@ +$ git diff-tree -c master +176b998f5d647cbd77a9d8acf4531e930754d16d +::100644 100644 100644 cead32e925b1420c84c14cbf7cf755e7e45af8ad 7289e35bff32727c08dda207511bec138fdb9ea5 992913c5aa0a5476d10c49ed0f21fc0c6d1aedf3 MM dir/sub +::100644 100644 100644 b414108e81e5091fe0974a1858b4d0d22b107f70 f4615da674c09df322d6ba8d6b21ecfb1b1ba510 10a8a9f3657f91a156b9f0184ed79a20adef9f7f MM file0 +$ |