git.octo.it Git - git.git/history - git-merge-recursive.py

2005-10-02	Fredrik Kuivinen	[PATCH] Teach the recursive merge strategy about renames.	blob \| commitdiff
2005-09-27	Junio C Hamano	Merge http://www.kernel.org/pub/scm/gitk/gitk	blob \| commitdiff \| diff to current
2005-09-25	Fredrik Kuivinen	[PATCH] recursive-merge: Don't print a stack trace...	blob \| commitdiff \| diff to current
2005-09-14	Junio C Hamano	Merge branch 'master' of .	blob \| commitdiff \| diff to current
2005-09-14	Junio C Hamano	git-merge-recursive: Trivial RE fixes.	blob \| commitdiff \| diff to current
2005-09-13	Fredrik Kuivinen	[PATCH] Use a temporary index file when we merge the...	blob \| commitdiff \| diff to current
2005-09-13	Fredrik Kuivinen	[PATCH] Adjust git-merge-recursive.py for the new tool...	blob \| commitdiff \| diff to current
2005-09-13	Fredrik Kuivinen	[PATCH] Don't output 'Automatic merge failed, ...'	blob \| commitdiff \| diff to current
2005-09-13	Fredrik Kuivinen	[PATCH] Be more like the 'resolve' strategy.	blob \| commitdiff \| diff to current
2005-09-13	Fredrik Kuivinen	[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.	blob \| commitdiff \| diff to current

The core git plumbing