From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Nov 2015 23:32:30 +0000 (-0800)
Subject: Merge branch 'gr/rebase-i-drop-warn' into maint
X-Git-Tag: v2.6.3~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c04b3a2dbff67605078139f97d4546716e4a1f40;p=git

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
---

c04b3a2dbff67605078139f97d4546716e4a1f40