[PATCH] rebase: use -f for checkout
From: Orgad Shaneh <hidden>
Date: 2016-06-15 22:56:45
Subsystem:
the rest · Maintainer:
Linus Torvalds
If a file's case is changed on rename (Foo -> foo), rebase fails on Windows because the file already exists. The change is safe, because if working directory is not clean rebase fails before checking out. --- git-rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index b2f1c76..28fdc32 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh@@ -522,7 +522,7 @@ test "$type" = interactive && run_specific_rebase # Detach HEAD and reset the tree say "$(gettext "First, rewinding head to replay your work on top of it...")" -git checkout -q "$onto^0" || die "could not detach HEAD" +git checkout -fq "$onto^0" || die "could not detach HEAD" git update-ref ORIG_HEAD $orig_head # If the $onto is a proper descendant of the tip of the branch, then
--
1.7.10.4