Rename .git/rebase to .git/rebase-apply

diff --git a/git-am.sh b/git-am.sh
index 60aaa4a583d3e2466ea788d7047a9fc8252b1fe6..9bf12feeb261a9c64568600ef33301e1585f57bb 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -121,7 +121,7 @@ It does not apply to blobs recorded in its index."
 }
 
 prec=4
-dotest="$GIT_DIR/rebase"
+dotest="$GIT_DIR/rebase-apply"
 sign= utf8=t keep= skip= interactive= resolved= binary= rebasing= abort=
 resolvemsg= resume=
 git_apply_opt=