52 commits

Author	SHA1	Message	Date
Junio C Hamano	ebcffb1d44	Merge branch 'js/merge-rr' ... * js/merge-rr: Move MERGE_RR from .git/rr-cache/ into .git/ Conflicts: builtin-rerere.c	2008-07-14 23:56:27 -07:00
Stephan Beyer	5b2fd95606	rerere: Separate libgit and builtin functions ... This patch moves rerere()-related functions into a newly created rerere.c file. The setup_rerere() function is needed by both rerere() and cmd_rerere(), so this function is moved to rerere.c and declared non-static (and "extern") in newly created rerere.h file. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2008-07-10 00:26:29 -07:00