summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2006-06-28 09:11:06 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-28 10:20:51 (GMT)
commit66eb64cba64a26dbf2b1d4e319d6514696154fee (patch)
treed38739ca87e2a0bc12e1c2ff09aaf83b6762079c
parent33ebb8717f15a85615f712df125c37737062e1b2 (diff)
downloadgit-66eb64cba64a26dbf2b1d4e319d6514696154fee.zip
git-66eb64cba64a26dbf2b1d4e319d6514696154fee.tar.gz
git-66eb64cba64a26dbf2b1d4e319d6514696154fee.tar.bz2
rebase: get rid of outdated MRESOLVEMSG
There was a time when rebase --skip didn't work when used with --merge, but that is no more so we don't need that message anymore. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rwxr-xr-xgit-rebase.sh11
1 files changed, 3 insertions, 8 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 0ac085e..fd0e7c4 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -34,11 +34,6 @@ When you have resolved this problem run \"git rebase --continue\".
If you would prefer to skip this patch, instead run \"git rebase --skip\".
To restore the original branch and stop rebasing run \"git rebase --abort\".
"
-
-MRESOLVEMSG="
-When you have resolved this problem run \"git rebase --continue\".
-To restore the original branch and stop rebasing run \"git rebase --abort\".
-"
unset newbase
strategy=recursive
do_merge=
@@ -54,7 +49,7 @@ continue_merge () {
then
echo "You still have unmerged paths in your index"
echo "did you forget update-index?"
- die "$MRESOLVEMSG"
+ die "$RESOLVEMSG"
fi
if test -n "`git-diff-index HEAD`"
@@ -87,11 +82,11 @@ call_merge () {
;;
1)
test -d "$GIT_DIR/rr-cache" && git-rerere
- die "$MRESOLVEMSG"
+ die "$RESOLVEMSG"
;;
2)
echo "Strategy: $rv $strategy failed, try another" 1>&2
- die "$MRESOLVEMSG"
+ die "$RESOLVEMSG"
;;
*)
die "Unknown exit code ($rv) from command:" \