diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-10-30 13:07:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-30 13:07:06 -0700 |
| commit | f60b5dc68cdb7a75e148c5b98238a880363cf870 (patch) | |
| tree | ea3c683a7187722c009642715a9650deed7e4575 /Documentation/diff-format.txt | |
| parent | Merge branch 'xf/user-manual-ff' (diff) | |
| parent | rebase-i: work around Windows CRLF line endings (diff) | |
| download | tgif-f60b5dc68cdb7a75e148c5b98238a880363cf870.tar.xz | |
Merge branch 'gr/rebase-i-drop-warn'
Recent update to "rebase -i" that tries to sanity check the edited
insn sheet before it uses it has become too picky on Windows where
CRLF left by the editor is turned into a trailing CR on the line
read via the "read" built-in command.
* gr/rebase-i-drop-warn:
rebase-i: work around Windows CRLF line endings
t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endings
Diffstat (limited to 'Documentation/diff-format.txt')
0 files changed, 0 insertions, 0 deletions