Merge branch 'ph/rebase-preserve-all-merges' into maint
[git] / t / t4013 / diff.whatchanged_--patch-with-stat_master_--_dir_
1 $ git whatchanged --patch-with-stat master -- dir/
2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
3 Author: A U Thor <author@example.com>
4 Date:   Mon Jun 26 00:03:00 2006 +0000
5
6     Side
7 ---
8  dir/sub | 2 ++
9  1 file changed, 2 insertions(+)
10
11 diff --git a/dir/sub b/dir/sub
12 index 35d242b..7289e35 100644
13 --- a/dir/sub
14 +++ b/dir/sub
15 @@ -1,2 +1,4 @@
16  A
17  B
18 +1
19 +2
20
21 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
22 Author: A U Thor <author@example.com>
23 Date:   Mon Jun 26 00:02:00 2006 +0000
24
25     Third
26 ---
27  dir/sub | 2 ++
28  1 file changed, 2 insertions(+)
29
30 diff --git a/dir/sub b/dir/sub
31 index 8422d40..cead32e 100644
32 --- a/dir/sub
33 +++ b/dir/sub
34 @@ -2,3 +2,5 @@ A
35  B
36  C
37  D
38 +E
39 +F
40
41 commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
42 Author: A U Thor <author@example.com>
43 Date:   Mon Jun 26 00:01:00 2006 +0000
44
45     Second
46     
47     This is the second commit.
48 ---
49  dir/sub | 2 ++
50  1 file changed, 2 insertions(+)
51
52 diff --git a/dir/sub b/dir/sub
53 index 35d242b..8422d40 100644
54 --- a/dir/sub
55 +++ b/dir/sub
56 @@ -1,2 +1,4 @@
57  A
58  B
59 +C
60 +D
61 $