undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gh/diff-raw-has-no-ellipses'

Browse Source 
"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
This commit is contained in:
Junio C Hamano 2018-12-01 21:41:45 +09:00
commit 15cc2da0b5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Documentation/diff-format.txt
View File

@ -26,12 +26,12 @@ line per changed file.
An output line is formatted this way: An output line is formatted this way:
------------------------------------------------ ------------------------------------------------
in-place edit :100644 100644 bcd1234... 0123456... M file0 in-place edit :100644 100644 bcd1234 0123456 M file0
copy-edit :100644 100644 abcd123... 1234567... C68 file1 file2 copy-edit :100644 100644 abcd123 1234567 C68 file1 file2
rename-edit :100644 100644 abcd123... 1234567... R86 file1 file3 rename-edit :100644 100644 abcd123 1234567 R86 file1 file3
create :000000 100644 0000000... 1234567... A file4 create :000000 100644 0000000 1234567 A file4
delete :100644 000000 1234567... 0000000... D file5 delete :100644 000000 1234567 0000000 D file5
unmerged :000000 000000 0000000... 0000000... U file6 unmerged :000000 000000 0000000 0000000 U file6
------------------------------------------------ ------------------------------------------------
That is, from the left to the right: That is, from the left to the right:
@ -75,7 +75,7 @@ and it is out of sync with the index.
Example: Example:
------------------------------------------------ ------------------------------------------------
:100644 100644 5be4a4...... 000000...... M file.c :100644 100644 5be4a4a 0000000 M file.c
------------------------------------------------ ------------------------------------------------
Without the `-z` option, pathnames with "unusual" characters are Without the `-z` option, pathnames with "unusual" characters are
@ -100,7 +100,7 @@ from the format described above in the following way:
Example: 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 Note that 'combined diff' lists only files which were modified from