summaryrefslogtreecommitdiff
path: root/git-resolve-script
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-07 00:39:14 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-07 00:39:14 (GMT)
commit3f4eff75308b86fe462a2333108470bd6556e3c4 (patch)
treebd808c081610bf2adeced95c5fd1243f47771f22 /git-resolve-script
parentc7c4bbe63193f580abd2460e96dd7e65f2d4904c (diff)
downloadgit-3f4eff75308b86fe462a2333108470bd6556e3c4.zip
git-3f4eff75308b86fe462a2333108470bd6556e3c4.tar.gz
git-3f4eff75308b86fe462a2333108470bd6556e3c4.tar.bz2
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.
Diffstat (limited to 'git-resolve-script')
-rw-r--r--git-resolve-script3
1 files changed, 0 insertions, 3 deletions
diff --git a/git-resolve-script b/git-resolve-script
index 186b234..74fb287 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