git - git

	Commit message (Expand)	Author	Age	Files	Lines
*	merge-recursive: Use '~' instead of '_' to separate file names from branch names	Fredrik Kuivinen	2005-11-12	1	-2/+2
*	merge-recursive: Add copyright notice	Fredrik Kuivinen	2005-11-12	1	-0/+3
*	merge-recursive: Indent the output properly	Fredrik Kuivinen	2005-11-12	1	-61/+69
*	merge-recursive: Fix support for branch names containing slashes	Fredrik Kuivinen	2005-11-09	1	-0/+1
*	merge-recursive: Fix limited output of rename messages	Fredrik Kuivinen	2005-11-09	1	-8/+4
*	merge-recursive: Only print relevant rename messages	Fredrik Kuivinen	2005-11-08	1	-7/+15
*	Deal with $(bindir) and friends with whitespaces.	Junio C Hamano	2005-10-10	1	-1/+1
*	[PATCH] Teach the recursive merge strategy about renames.	Fredrik Kuivinen	2005-10-02	1	-185/+601
*	[PATCH] recursive-merge: Don't print a stack trace when read-tree fails.	Fredrik Kuivinen	2005-09-26	1	-3/+9
*	git-merge-recursive: Trivial RE fixes.	Junio C Hamano	2005-09-14	1	-2/+2
*	[PATCH] Use a temporary index file when we merge the common ancestors.	Fredrik Kuivinen	2005-09-14	1	-5/+18
*	[PATCH] Adjust git-merge-recursive.py for the new tool names.	Fredrik Kuivinen	2005-09-14	1	-4/+4
*	[PATCH] Don't output 'Automatic merge failed, ...'	Fredrik Kuivinen	2005-09-14	1	-1/+0
*	[PATCH] Be more like the 'resolve' strategy.	Fredrik Kuivinen	2005-09-14	1	-35/+33
*	[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.	Fredrik Kuivinen	2005-09-13	1	-0/+429