Skip to content

Commit

Permalink
rebase: get rid of outdated MRESOLVEMSG
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric Wong authored and Junio C Hamano committed Jun 28, 2006
1 parent 33ebb87 commit 66eb64c
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions git-rebase.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand All @@ -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`"
Expand Down Expand Up @@ -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:" \
Expand Down

0 comments on commit 66eb64c

Please sign in to comment.