diff options
| -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 |