git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f836a32 39743cf)
Merge branch 'gr/rebase-i-drop-warn' into maint
authorJunio C Hamano <redacted>
Tue, 3 Nov 2015 23:32:30 +0000 (15:32 -0800)
committerJunio C Hamano <redacted>
Tue, 3 Nov 2015 23:32:30 +0000 (15:32 -0800)
commitc04b3a2dbff67605078139f97d4546716e4a1f40
tree731b606c724015edc2169ec153472bd67fc9639ctree | snapshot
parentf836a32ba75beded3bca960f2918e08309642c62commit | diff
parent39743cf554caaed462464b55315ab5b37f5ab1b9commit | 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
git-rebase--interactive.sh diff1 | diff2 | blob | history
t/t3404-rebase-interactive.sh diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT