org/kernel/git.git - forked from git/git

	Commit message (Collapse)	Author	Age
*	rerere.autoupdate: change the message when autoupdate is in effect	Junio C Hamano	2008-07-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This changes the message rerere issues after reusing previous conflict resolution from "Resolved" to "Staged" when autoupdate option is in effect. It is envisioned that in practice, some auto resolitions are trickier and iffier than others, and we would want to add a feature to mark individual resolutions as "this is ok to autoupdate" or "do not autoupdate the result using this resolution even when rerere.autoupdate is in effect" in the future. When that happens, these messages will make the distinction clearer. Signed-off-by: Junio C Hamano <gitster@pobox.com>
*	Merge branch 'js/merge-rr'	Junio C Hamano	2008-07-14
\| \| \| \| \| \| \| \|	* js/merge-rr: Move MERGE_RR from .git/rr-cache/ into .git/ Conflicts: builtin-rerere.c
*	rerere: Separate libgit and builtin functions	Stephan Beyer	2008-07-10
	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>