mirror of
https://github.com/git/git.git
synced 2024-05-25 14:46:09 +02:00
c2f1d39897
Use newly-introduced finely-grained control to teach the diff-family to honor the new environment GIT_PRINT_SHA1_ELLIPSIS and remove the ellipses when it is not set. Mentored-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Ann T Ropea <bedhanger@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
37 lines
524 B
Plaintext
37 lines
524 B
Plaintext
$ 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
|
|
$
|