Age | Commit message (Expand) | Author |
---|---|---|
2010-01-21 | Merge branch 'ap/merge-backend-opts' | Junio C Hamano |
2010-01-18 | Make "subtree" part more orthogonal to the rest of merge-recursive. | Junio C Hamano |
2010-01-18 | git merge -X<option> | Avery Pennarun |
2009-11-30 | merge-recursive: make the error-message generation an extern function | Matthieu Moy |
2008-09-05 | merge-recursive: move current_{file,directory}_set to struct merge_options | Miklos Vajna |
2008-09-05 | merge-recursive: move the global obuf to struct merge_options | Miklos Vajna |
2008-09-04 | merge-recursive: move call_depth to struct merge_options | Miklos Vajna |
2008-08-31 | merge-recursive: introduce merge_options | Miklos Vajna |
2008-08-31 | merge-recursive.c: Add more generic merge_recursive_generic() | Stephan Beyer |
2008-08-31 | Split out merge_recursive() to merge-recursive.c | Miklos Vajna |
2008-02-10 | Build-in merge-recursive | Daniel Barkalow |