| commit | c04b3a2dbff67605078139f97d4546716e4a1f40 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Nov 2015 23:32:30 +0000 (3 15:32 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Nov 2015 23:32:30 +0000 (3 15:32 -0800) | ||
| tree | 731b606c724015edc2169ec153472bd67fc9639c | treesnapshot (tar.gz zip) |
| parent | f836a32ba75beded3bca960f2918e08309642c62 | commitdiff |
| parent | 39743cf554caaed462464b55315ab5b37f5ab1b9 | commitdiff |
Merge branch 'gr/rebase-i-drop-warn' into maint
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 |