projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c7c4bbe
)
git-resolve-script: don't wait for three seconds any more
author
Linus Torvalds
<torvalds@ppc970.osdl.org>
Tue, 7 Jun 2005 00:39:14 +0000
(17:39 -0700)
committer
Linus Torvalds
<torvalds@ppc970.osdl.org>
Tue, 7 Jun 2005 00:39:14 +0000
(17:39 -0700)
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
patch
|
blob
|
history
diff --git
a/git-resolve-script
b/git-resolve-script
index 186b234b24e2581c3db9864a751b7e6c9e837c56..74fb2875b5d7b9e5802ef7b21111584031c7c59b 100644
(file)
--- 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