Age | Commit message (Collapse) | Author | |
---|---|---|---|
2008-07-15 | Merge branch 'js/merge-rr' | Junio C Hamano | |
* js/merge-rr: Move MERGE_RR from .git/rr-cache/ into .git/ Conflicts: builtin-rerere.c | |||
2008-07-10 | rerere: Separate libgit and builtin functions | Stephan Beyer | |
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> |