diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-06 17:39:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-06 17:39:14 -0700 |
| commit | 3f4eff75308b86fe462a2333108470bd6556e3c4 (patch) | |
| tree | bd808c081610bf2adeced95c5fd1243f47771f22 | |
| parent | c7c4bbe63193f580abd2460e96dd7e65f2d4904c (diff) | |
| download | git-3f4eff75308b86fe462a2333108470bd6556e3c4.tar.gz git-3f4eff75308b86fe462a2333108470bd6556e3c4.tar.xz | |
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.
| -rw-r--r-- | git-resolve-script | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/git-resolve-script b/git-resolve-script index 186b234b2..74fb2875b 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 |