undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2006-12-22 15:21:55 -08:00
parent 2295e8d0c4
commit 228e2eb67e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge.sh
View File

@ -32,7 +32,7 @@ savestate() {
restorestate() { restorestate() {
if test -f "$GIT_DIR/MERGE_SAVE" if test -f "$GIT_DIR/MERGE_SAVE"
then then
git reset --hard $head git reset --hard $head >/dev/null
cpio -iuv <"$GIT_DIR/MERGE_SAVE" cpio -iuv <"$GIT_DIR/MERGE_SAVE"
git-update-index --refresh >/dev/null git-update-index --refresh >/dev/null
fi fi

1
git-rebase.sh
View File

@ -292,6 +292,7 @@ then
fi fi
# Rewind the head to "$onto"; this saves our current head in ORIG_HEAD. # 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" git-reset --hard "$onto"
# If the $onto is a proper descendant of the tip of the branch, then # If the $onto is a proper descendant of the tip of the branch, then