summaryrefslogtreecommitdiff
path: root/t/t5515
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-10-30 13:07:06 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-10-30 13:07:06 -0700
commitf60b5dc68cdb7a75e148c5b98238a880363cf870 (patch)
treeea3c683a7187722c009642715a9650deed7e4575 /t/t5515
parentMerge branch 'xf/user-manual-ff' (diff)
parentrebase-i: work around Windows CRLF line endings (diff)
downloadtgif-f60b5dc68cdb7a75e148c5b98238a880363cf870.tar.xz
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
Diffstat (limited to 't/t5515')
0 files changed, 0 insertions, 0 deletions