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.show_master | |
parent | 169c2e9d1e81b3e7129248d89de160a7bb242411 (diff) | |
parent | 047fbe906b375e8a3a7564ad0e4443f62dd528a2 (diff) | |
download | git-0c926a3d9c34396636c2fea7a0cd5a4200ea298b.tar.gz git-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.show_master')
-rw-r--r-- | t/t4013/diff.show_master | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/t/t4013/diff.show_master b/t/t4013/diff.show_master new file mode 100644 index 000000000..3772a87e1 --- /dev/null +++ b/t/t4013/diff.show_master @@ -0,0 +1,36 @@ +$ git show master +commit 176b998f5d647cbd77a9d8acf4531e930754d16d +Merge: 889b315... c7a2ab9... +Author: A U Thor <author@example.com> +Date: Mon Jun 26 00:04:00 2006 +0000 + + Merge branch 'side' + +diff --cc dir/sub +index cead32e,7289e35..992913c +--- a/dir/sub ++++ b/dir/sub +@@@ -1,6 -1,4 +1,8 @@@ + A + B + +C + +D + +E + +F ++ 1 ++ 2 +diff --cc file0 +index b414108,f4615da..10a8a9f +--- a/file0 ++++ b/file0 +@@@ -1,6 -1,6 +1,9 @@@ + 1 + 2 + 3 + +4 + +5 + +6 ++ A ++ B ++ C +$ |