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_-p_master | |
| parent | Merge branch 'jc/grepfix' (diff) | |
| parent | builtin-diff: turn recursive on when defaulting to --patch format. (diff) | |
| download | tgif-0c926a3d9c34396636c2fea7a0cd5a4200ea298b.tar.xz | |
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_-p_master')
| -rw-r--r-- | t/t4013/diff.diff-tree_-p_master | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t4013/diff.diff-tree_-p_master b/t/t4013/diff.diff-tree_-p_master new file mode 100644 index 0000000000..b182875fb2 --- /dev/null +++ b/t/t4013/diff.diff-tree_-p_master @@ -0,0 +1,2 @@ +$ git diff-tree -p master +$ |