doc: update diff-format.txt for removed ellipses in --raw
Since 7cb6ac1e4b ("diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value", 2017-12-03), the "--raw" format of diff does not add ellipses in an attempt to align the output, but the documentation was not updated to reflect this. Signed-off-by: Greg Hurrell <greg@hurrell.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Greg Hurrell committed
Nov 24, 2018 at 10:29 UTC
f9ea6e45edb71d83630f307cd0cba8dc52f48374
1 file changed
+8
-8
Documentation/diff-format.txt
+8
-8
@@ -26,12 +26,12 @@ line per changed file.
26
An output line is formatted this way:
27
28
------------------------------------------------
29
-in-place edit :100644 100644 bcd1234... 0123456... M file0
30
-copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
31
-rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
32
-create :000000 100644 0000000... 1234567... A file4
33
-delete :100644 000000 1234567... 0000000... D file5
34
-unmerged :000000 000000 0000000... 0000000... U file6
29
+in-place edit :100644 100644 bcd1234 0123456 M file0
30
+copy-edit :100644 100644 abcd123 1234567 C68 file1 file2
31
+rename-edit :100644 100644 abcd123 1234567 R86 file1 file3
32
+create :000000 100644 0000000 1234567 A file4
33
+delete :100644 000000 1234567 0000000 D file5
34
+unmerged :000000 000000 0000000 0000000 U file6
35
------------------------------------------------
36
37
That is, from the left to the right:
@@ -75,7 +75,7 @@ and it is out of sync with the index.
75
Example:
76
77
------------------------------------------------
78
-:100644 100644 5be4a4...... 000000...... M file.c
78
+:100644 100644 5be4a4a 0000000 M file.c
79
------------------------------------------------
80
81
Without the `-z` option, pathnames with "unusual" characters are
@@ -100,7 +100,7 @@ from the format described above in the following way:
100
Example:
101
102
------------------------------------------------
103
-::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c
103
+::100644 100644 100644 fabadb8 cc95eb0 4866510 MM describe.c
104
------------------------------------------------
105
106
Note that 'combined diff' lists only files which were modified from