From 3f4eff75308b86fe462a2333108470bd6556e3c4 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 6 Jun 2005 17:39:14 -0700 Subject: [PATCH] git-resolve-script: don't wait for three seconds any more We used to overwrite peoples dirty state. We don't any more. So don't print the scary message and don't delay, just do the update already. --- git-resolve-script | 3 --- 1 file changed, 3 deletions(-) diff --git a/git-resolve-script b/git-resolve-script index 186b234b..74fb2875 100644 --- a/git-resolve-script +++ b/git-resolve-script @@ -36,9 +36,6 @@ if [ "$common" == "$merge" ]; then fi if [ "$common" == "$head" ]; then echo "Updating from $head to $merge." - echo "Destroying all noncommitted data!" - echo "Kill me within 3 seconds.." - sleep 3 git-read-tree -u -m $head $merge || exit 1 echo $merge > "$GIT_DIR"/HEAD git-diff-tree -p ORIG_HEAD HEAD | git-apply --stat -- 2.11.0