Skip to content

Commit

Permalink
doc: update diff-format.txt for removed ellipses in --raw
Browse files Browse the repository at this point in the history
Since 7cb6ac1 ("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 <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
wincent authored and gitster committed Nov 26, 2018
1 parent 7f4e641 commit f9ea6e4
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions Documentation/diff-format.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ line per changed file.
An output line is formatted this way:

------------------------------------------------
in-place edit :100644 100644 bcd1234... 0123456... M file0
copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2
rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3
create :000000 100644 0000000... 1234567... A file4
delete :100644 000000 1234567... 0000000... D file5
unmerged :000000 000000 0000000... 0000000... U file6
in-place edit :100644 100644 bcd1234 0123456 M file0
copy-edit :100644 100644 abcd123 1234567 C68 file1 file2
rename-edit :100644 100644 abcd123 1234567 R86 file1 file3
create :000000 100644 0000000 1234567 A file4
delete :100644 000000 1234567 0000000 D file5
unmerged :000000 000000 0000000 0000000 U file6
------------------------------------------------

That is, from the left to the right:
Expand Down Expand Up @@ -75,7 +75,7 @@ and it is out of sync with the index.
Example:

------------------------------------------------
:100644 100644 5be4a4...... 000000...... M file.c
:100644 100644 5be4a4a 0000000 M file.c
------------------------------------------------

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

------------------------------------------------
::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c
::100644 100644 100644 fabadb8 cc95eb0 4866510 MM describe.c
------------------------------------------------

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

0 comments on commit f9ea6e4

Please sign in to comment.