Ann T Ropea | c2f1d39 | 2017-12-03 22:27:43 +0100 | [diff] [blame] | 1 | $ git diff --patch-with-raw initial..side |
| 2 | :100644 100644 35d242b 7289e35 M dir/sub |
| 3 | :100644 100644 01e79c3 f4615da M file0 |
| 4 | :000000 100644 0000000 7289e35 A file3 |
| 5 | |
| 6 | diff --git a/dir/sub b/dir/sub |
| 7 | index 35d242b..7289e35 100644 |
| 8 | --- a/dir/sub |
| 9 | +++ b/dir/sub |
| 10 | @@ -1,2 +1,4 @@ |
| 11 | A |
| 12 | B |
| 13 | +1 |
| 14 | +2 |
| 15 | diff --git a/file0 b/file0 |
| 16 | index 01e79c3..f4615da 100644 |
| 17 | --- a/file0 |
| 18 | +++ b/file0 |
| 19 | @@ -1,3 +1,6 @@ |
| 20 | 1 |
| 21 | 2 |
| 22 | 3 |
| 23 | +A |
| 24 | +B |
| 25 | +C |
| 26 | diff --git a/file3 b/file3 |
| 27 | new file mode 100644 |
| 28 | index 0000000..7289e35 |
| 29 | --- /dev/null |
| 30 | +++ b/file3 |
| 31 | @@ -0,0 +1,4 @@ |
| 32 | +A |
| 33 | +B |
| 34 | +1 |
| 35 | +2 |
| 36 | $ |