summaryrefslogtreecommitdiffstats
path: root/diff.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-07 02:39:14 +0200
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-07 02:39:14 +0200
commit3f4eff75308b86fe462a2333108470bd6556e3c4 (patch)
treebd808c081610bf2adeced95c5fd1243f47771f22 /diff.c
parent[PATCH] -w support for git-ssh-pull/push (diff)
downloadgit-3f4eff75308b86fe462a2333108470bd6556e3c4.tar.xz
git-3f4eff75308b86fe462a2333108470bd6556e3c4.zip
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 'diff.c')
0 files changed, 0 insertions, 0 deletions