{"thread":{"id":"33461","subject":"[PATCH] rebase: use -f for checkout","startedAt":"2013-04-10T18:11:24Z","lastAt":"2013-04-10T18:11:24Z","messageCount":1,"participants":["Orgad Shaneh"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"213793","messageId":"1365617484-5181-1-git-send-email-orgads@gmail.com","threadId":"33461","inReplyTo":null,"subject":"[PATCH] rebase: use -f for checkout","fromName":"Orgad Shaneh","fromEmail":"orgads@gmail.com","sentAt":"2013-04-10T18:11:24Z","receivedAt":"2013-04-10T18:11:24Z","isPatch":true,"sender":{"key":"orgads@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1246544?v=4"},"body":"If a file's case is changed on rename (Foo -> foo), rebase\nfails on Windows because the file already exists.\n\nThe change is safe, because if working directory is not clean\nrebase fails before checking out.\n---\n git-rebase.sh |    2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex b2f1c76..28fdc32 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -522,7 +522,7 @@ test \"$type\" = interactive && run_specific_rebase\n \n # Detach HEAD and reset the tree\n say \"$(gettext \"First, rewinding head to replay your work on top of it...\")\"\n-git checkout -q \"$onto^0\" || die \"could not detach HEAD\"\n+git checkout -fq \"$onto^0\" || die \"could not detach HEAD\"\n git update-ref ORIG_HEAD $orig_head\n \n # If the $onto is a proper descendant of the tip of the branch, then\n-- \n1.7.10.4\n"}]}