Skip to content

Commit 15cc2da

Browse files
committed
Merge branch 'gh/diff-raw-has-no-ellipses'
"git diff --raw" lost ellipses to adjust the output columns for some time now, but the documentation still showed them. * gh/diff-raw-has-no-ellipses: doc: update diff-format.txt for removed ellipses in --raw
2 parents c0e286a + f9ea6e4 commit 15cc2da

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Documentation/diff-format.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ line per changed file.
2626
An output line is formatted this way:
2727

2828
------------------------------------------------
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
3535
------------------------------------------------
3636

3737
That is, from the left to the right:
@@ -75,7 +75,7 @@ and it is out of sync with the index.
7575
Example:
7676

7777
------------------------------------------------
78-
:100644 100644 5be4a4...... 000000...... M file.c
78+
:100644 100644 5be4a4a 0000000 M file.c
7979
------------------------------------------------
8080

8181
Without the `-z` option, pathnames with "unusual" characters are
@@ -100,7 +100,7 @@ from the format described above in the following way:
100100
Example:
101101

102102
------------------------------------------------
103-
::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c
103+
::100644 100644 100644 fabadb8 cc95eb0 4866510 MM describe.c
104104
------------------------------------------------
105105

106106
Note that 'combined diff' lists only files which were modified from

0 commit comments

Comments
 (0)