projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3ac53e0) | patch
rerere should not repeat the earlier hunks in later ones
authorJunio C Hamano <junkio@cox.net>
Tue, 3 Apr 2007 23:28:46 +0000 (16:28 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 4 Apr 2007 02:01:36 +0000 (19:01 -0700)
commiteb3359663d62f35999330797455dbe738bd5ed99
treead96b70ce6f5834453867fa4dbd422cc767c09a8tree | snapshot
parent3ac53e0d13fa7483cce90eb6a1cfcdcbda5b8e35commit | diff
rerere should not repeat the earlier hunks in later ones

When a file has more then one conflicting hunks, it repeated the
contents of previous hunks in output for later ones.

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