Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Rename ".dotest/" to ".git/rebase" and ".dotest-merge" to "rebase-merge"
[gitweb.git]
/
git-rebase--interactive.sh
diff --git
a/git-rebase--interactive.sh
b/git-rebase--interactive.sh
index a35212d9de23e97055936b23dd8657a584116d76..da79a2456814e4038a42238e0865d8950c14dff0 100755
(executable)
--- a/
git-rebase--interactive.sh
+++ b/
git-rebase--interactive.sh
@@
-31,7
+31,7
@@
skip skip current patch and continue rebasing process
. git-sh-setup
require_work_tree
-DOTEST="$GIT_DIR/
.dotest
-merge"
+DOTEST="$GIT_DIR/
rebase
-merge"
TODO="$DOTEST"/git-rebase-todo
DONE="$DOTEST"/done
MSG="$DOTEST"/message