projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: cef19c7) | patch
rerere: do not skip two conflicted paths next to each other.
authorJunio C Hamano <junkio@cox.net>
Sun, 25 Feb 2007 09:24:34 +0000 (01:24 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 25 Feb 2007 09:28:44 +0000 (01:28 -0800)
commitab242f809a9e06ebf935c0512155fc5661ab84ab
tree4829afb6d0e4a7947756b89207f6e380fb906d18tree | snapshot
parentcef19c7af5202c547abe4c8a538ac7b9a4970f0ecommit | diff
rerere: do not skip two conflicted paths next to each other.

The code forgot to take the for (;;) loop control into account,
incrementing the index once too many.

Signed-off-by: Junio C Hamano <junkio@cox.net>
builtin-rerere.c diff | blob | history
Git—the stupid content tracker