]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3583730 6c722cb)
Merge branch 'cw/bisect-replay-with-dos'
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 May 2020 21:39:41 +0000 (14:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 May 2020 21:39:41 +0000 (14:39 -0700)
"git bisect replay" had trouble with input files when they used
CRLF line ending, which has been corrected.

* cw/bisect-replay-with-dos:
  bisect: allow CRLF line endings in "git bisect replay" input

1  2 
t/t6030-bisect-porcelain.sh patch | diff1 | diff2 | blob | history

diff --cc t/t6030-bisect-porcelain.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.