projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1b79d1c) | patch
MERGE_RR is in .git, not .git/rr-cache
authorJay Soffian <jaysoffian@gmail.com>
Wed, 14 Jul 2010 17:18:11 +0000 (13:18 -0400)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Jul 2010 20:04:25 +0000 (13:04 -0700)
commit3ca399d40ae024a1eaf5c8f71c9cf13da3198cf3
tree5a6087ccd95cf00c8e23e8b325964ef78ca2046dtree | snapshot
parent1b79d1c2a8a90419238f7213870ab1dc465082fecommit | diff
MERGE_RR is in .git, not .git/rr-cache

0af0ac7 (Move MERGE_RR from .git/rr-cache/ into .git/) moved the
location of MERGE_RR but I found a few references to the old
location.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/rerere.c diff | blob | history
t/t4151-am-abort.sh diff | blob | history
Git—the stupid content tracker