diff --git a/git-merge.sh b/git-merge.sh
index 4ebfcf65d99f7743048df901b38969c28cc11edb..7dd0a112368a8b3672a98fdfcdb5290146cefeba 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
restorestate() {
if test -f "$GIT_DIR/MERGE_SAVE"
then
- git reset --hard $head
+ git reset --hard $head >/dev/null
cpio -iuv <"$GIT_DIR/MERGE_SAVE"
git-update-index --refresh >/dev/null
fi
remotehead=$(git-rev-parse --verify "$remote"^0 2>/dev/null) ||
die "$remote - not something we can merge"
remoteheads="${remoteheads}$remotehead "
+ eval GITHEAD_$remotehead='"$remote"'
+ export GITHEAD_$remotehead
done
set x $remoteheads ; shift