| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'gv/portable' | Junio C Hamano | 2010-06-21 | 1 | -1/+1 |
|\ |
|
| * | enums: omit trailing comma for portability | Gary V. Vaughan | 2010-05-31 | 1 | -1/+1 |
* | | merge: make function try_merge_command non static | Christian Couder | 2010-04-01 | 1 | -0/+3 |
|/ |
|
* | merge_trees(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 2010-03-20 | 1 | -0/+1 |
* | Merge branch 'ap/merge-backend-opts' | Junio C Hamano | 2010-01-20 | 1 | -1/+6 |
|\ |
|
| * | Make "subtree" part more orthogonal to the rest of merge-recursive. | Junio C Hamano | 2010-01-17 | 1 | -1/+2 |
| * | git merge -X<option> | Avery Pennarun | 2010-01-17 | 1 | -1/+5 |
* | | merge-recursive: make the error-message generation an extern function | Matthieu Moy | 2009-11-29 | 1 | -0/+3 |
|/ |
|
* | merge-recursive: move current_{file,directory}_set to struct merge_options | Miklos Vajna | 2008-09-04 | 1 | -0/+4 |
* | merge-recursive: move the global obuf to struct merge_options | Miklos Vajna | 2008-09-04 | 1 | -0/+1 |
* | merge-recursive: move call_depth to struct merge_options | Miklos Vajna | 2008-09-03 | 1 | -0/+1 |
* | merge-recursive: introduce merge_options | Miklos Vajna | 2008-08-30 | 1 | -13/+29 |
* | merge-recursive.c: Add more generic merge_recursive_generic() | Stephan Beyer | 2008-08-30 | 1 | -1/+3 |
* | Split out merge_recursive() to merge-recursive.c | Miklos Vajna | 2008-08-30 | 1 | -1/+5 |
* | Build-in merge-recursive | Daniel Barkalow | 2008-02-09 | 1 | -0/+20 |