]> git.ipfire.org Git - thirdparty/git.git/blob - t/t4013/diff.whatchanged_-p_master
Merge branch 'bc/sha-256-part-2'
[thirdparty/git.git] / t / t4013 / diff.whatchanged_-p_master
1 $ git whatchanged -p master
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 diff --git a/dir/sub b/dir/sub
9 index 35d242b..7289e35 100644
10 --- a/dir/sub
11 +++ b/dir/sub
12 @@ -1,2 +1,4 @@
13 A
14 B
15 +1
16 +2
17 diff --git a/file0 b/file0
18 index 01e79c3..f4615da 100644
19 --- a/file0
20 +++ b/file0
21 @@ -1,3 +1,6 @@
22 1
23 2
24 3
25 +A
26 +B
27 +C
28 diff --git a/file3 b/file3
29 new file mode 100644
30 index 0000000..7289e35
31 --- /dev/null
32 +++ b/file3
33 @@ -0,0 +1,4 @@
34 +A
35 +B
36 +1
37 +2
38
39 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
40 Author: A U Thor <author@example.com>
41 Date: Mon Jun 26 00:02:00 2006 +0000
42
43 Third
44
45 diff --git a/dir/sub b/dir/sub
46 index 8422d40..cead32e 100644
47 --- a/dir/sub
48 +++ b/dir/sub
49 @@ -2,3 +2,5 @@ A
50 B
51 C
52 D
53 +E
54 +F
55 diff --git a/file1 b/file1
56 new file mode 100644
57 index 0000000..b1e6722
58 --- /dev/null
59 +++ b/file1
60 @@ -0,0 +1,3 @@
61 +A
62 +B
63 +C
64
65 commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
66 Author: A U Thor <author@example.com>
67 Date: Mon Jun 26 00:01:00 2006 +0000
68
69 Second
70
71 This is the second commit.
72
73 diff --git a/dir/sub b/dir/sub
74 index 35d242b..8422d40 100644
75 --- a/dir/sub
76 +++ b/dir/sub
77 @@ -1,2 +1,4 @@
78 A
79 B
80 +C
81 +D
82 diff --git a/file0 b/file0
83 index 01e79c3..b414108 100644
84 --- a/file0
85 +++ b/file0
86 @@ -1,3 +1,6 @@
87 1
88 2
89 3
90 +4
91 +5
92 +6
93 diff --git a/file2 b/file2
94 deleted file mode 100644
95 index 01e79c3..0000000
96 --- a/file2
97 +++ /dev/null
98 @@ -1,3 +0,0 @@
99 -1
100 -2
101 -3
102 $