| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | merge_trees(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 2010-03-20 |
| * | Merge branch 'ap/merge-backend-opts' | Junio C Hamano | 2010-01-20 |
| |\ | |||
| | * | Make "subtree" part more orthogonal to the rest of merge-recursive. | Junio C Hamano | 2010-01-17 |
| | * | git merge -X<option> | Avery Pennarun | 2010-01-17 |
| * | | merge-recursive: make the error-message generation an extern function | Matthieu Moy | 2009-11-29 |
| |/ | |||
| * | merge-recursive: move current_{file,directory}_set to struct merge_options | Miklos Vajna | 2008-09-04 |
| * | 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-09-03 |
| * | merge-recursive: introduce merge_options | Miklos Vajna | 2008-08-30 |
| * | merge-recursive.c: Add more generic merge_recursive_generic() | Stephan Beyer | 2008-08-30 |
| * | Split out merge_recursive() to merge-recursive.c | Miklos Vajna | 2008-08-30 |
| * | Build-in merge-recursive | Daniel Barkalow | 2008-02-09 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |
path: root/merge-recursive.h