projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8918b0c) | patch
merge-recur: do not die unnecessarily
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Wed, 9 Aug 2006 20:31:49 +0000 (22:31 +0200)
committerJunio C Hamano <junkio@cox.net>
Wed, 9 Aug 2006 21:57:27 +0000 (14:57 -0700)
commit984b65707e25c426a32feb9b9d46f077b605cb31
tree0d2c7afe34844fd1ff9016909978ed4e6e641ad7tree | snapshot
parent8918b0c9c2667c5a69461955135c709b09561f72commit | diff
merge-recur: do not die unnecessarily

When the cache is dirty, and we switch the index file from temporary
to final, we want to discard the cache without complaint.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
merge-recursive.c diff | blob | history
Git—the stupid content tracker