diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-22 15:21:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-22 15:21:55 -0800 |
| commit | 228e2eb67e9f15983519f472cc1566a3dd857f9c (patch) | |
| tree | 2ba0c8bf7369621e825bf1e9f486e64abf52ff61 | |
| parent | 2295e8d0c4cec41fbe257ddb957516a7c1a139df (diff) | |
| download | git-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>
| -rwxr-xr-x | git-merge.sh | 2 | ||||
| -rwxr-xr-x | git-rebase.sh | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh index 4ebfcf65d9..aec215e725 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 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 |