summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-22 15:21:55 -0800
committerJunio C Hamano <junkio@cox.net>2006-12-22 15:21:55 -0800
commit228e2eb67e9f15983519f472cc1566a3dd857f9c (patch)
tree2ba0c8bf7369621e825bf1e9f486e64abf52ff61 /git-rebase.sh
parent2295e8d0c4cec41fbe257ddb957516a7c1a139df (diff)
downloadgit-228e2eb67e9f15983519f472cc1566a3dd857f9c.tar.gz
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>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 2b4f3477fa..ece31425d0 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