From: Junio C Hamano <junkio@cox.net>
Date: Fri, 22 Dec 2006 23:21:55 +0000 (-0800)
Subject: merge and reset: adjust for "reset --hard" messages
X-Git-Tag: v1.5.0-rc0~37
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=228e2eb67e9f15983519f472cc1566a3dd857f9c;p=git.git

merge and reset: adjust for "reset --hard" messages

An earlier commit made "reset --hard" chattier but leaking its
message from "git rebase" (which calls it when first rewinding
the current branch to prepare replaying our own changes) without
explanation was confusing, so add an extra message to mention
it.  Inside restorestate in merge (which is rarely exercised
codepath, where more than one strategies are attempted),
resetting to the original state uses "reset --hard" -- this can
be squelched entirely.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-merge.sh b/git-merge.sh
index 4ebfcf65d..aec215e72 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -32,7 +32,7 @@ savestate() {
 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
diff --git a/git-rebase.sh b/git-rebase.sh
index 2b4f3477f..ece31425d 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -292,6 +292,7 @@ then
 fi
 
 # Rewind the head to "$onto"; this saves our current head in ORIG_HEAD.
+echo "First, rewinding head to replay your work on top of it..."
 git-reset --hard "$onto"
 
 # If the $onto is a proper descendant of the tip of the branch, then