projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c7c4bbe) | patch
git-resolve-script: don't wait for three seconds any more
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 7 Jun 2005 00:39:14 +0000 (17:39 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 7 Jun 2005 00:39:14 +0000 (17:39 -0700)
commit3f4eff75308b86fe462a2333108470bd6556e3c4
treebd808c081610bf2adeced95c5fd1243f47771f22tree | snapshot
parentc7c4bbe63193f580abd2460e96dd7e65f2d4904ccommit | diff
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 diff | blob | history
The core git plumbing