| commit | f60b5dc68cdb7a75e148c5b98238a880363cf870 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 30 Oct 2015 20:07:06 +0000 (30 13:07 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 30 Oct 2015 20:07:06 +0000 (30 13:07 -0700) | ||
| tree | ea3c683a7187722c009642715a9650deed7e4575 | treesnapshot (tar.gz zip) |
| parent | 7fd4181c661260f10bf8cb3e80489c230205d774 | commitdiff |
| parent | 39743cf554caaed462464b55315ab5b37f5ab1b9 | commitdiff |
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
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
| git-rebase--interactive.sh | diff1 | diff2 | blobhistory |
| t/t3404-rebase-interactive.sh | diff1 | diff2 | blobhistory |