mirror of
https://github.com/git/git.git
synced 2024-10-31 06:17:56 +01:00
b319b02e2a
Signed-off-by: Junio C Hamano <junkio@cox.net>
36 lines
542 B
Text
36 lines
542 B
Text
$ git diff --patch-with-raw -r initial..side
|
|
:100644 100644 35d242b... 7289e35... M dir/sub
|
|
:100644 100644 01e79c3... f4615da... M file0
|
|
:000000 100644 0000000... 7289e35... A file3
|
|
|
|
diff --git a/dir/sub b/dir/sub
|
|
index 35d242b..7289e35 100644
|
|
--- a/dir/sub
|
|
+++ b/dir/sub
|
|
@@ -1,2 +1,4 @@
|
|
A
|
|
B
|
|
+1
|
|
+2
|
|
diff --git a/file0 b/file0
|
|
index 01e79c3..f4615da 100644
|
|
--- a/file0
|
|
+++ b/file0
|
|
@@ -1,3 +1,6 @@
|
|
1
|
|
2
|
|
3
|
|
+A
|
|
+B
|
|
+C
|
|
diff --git a/file3 b/file3
|
|
new file mode 100644
|
|
index 0000000..7289e35
|
|
--- /dev/null
|
|
+++ b/file3
|
|
@@ -0,0 +1,4 @@
|
|
+A
|
|
+B
|
|
+1
|
|
+2
|
|
$
|