diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-11-04 02:32:30 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-11-04 02:32:30 +0300 |
| commit | c04b3a2dbff67605078139f97d4546716e4a1f40 (patch) | |
| tree | 731b606c724015edc2169ec153472bd67fc9639c /git-p4.py | |
| parent | f836a32ba75beded3bca960f2918e08309642c62 (diff) | |
| parent | 39743cf554caaed462464b55315ab5b37f5ab1b9 (diff) | |
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
Diffstat (limited to 'git-p4.py')
0 files changed, 0 insertions, 0 deletions