diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-07 00:39:14 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-07 00:39:14 (GMT) |
| commit | 3f4eff75308b86fe462a2333108470bd6556e3c4 (patch) | |
| tree | bd808c081610bf2adeced95c5fd1243f47771f22 /commit.c | |
| parent | c7c4bbe63193f580abd2460e96dd7e65f2d4904c (diff) | |
| download | git-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 'commit.c')
0 files changed, 0 insertions, 0 deletions