| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2010-01-20 | Merge branch 'ap/merge-backend-opts' |  Junio C Hamano | 1 | -1/+6 |
| 2010-01-17 | Make "subtree" part more orthogonal to the rest of merge-recursive. | Junio C Hamano | 1 | -1/+2 |
| 2010-01-17 | git merge -X<option> |  Avery Pennarun | 1 | -1/+5 |
| 2009-11-29 | merge-recursive: make the error-message generation an extern function |  Matthieu Moy | 1 | -0/+3 |
| 2008-09-04 | merge-recursive: move current_{file,directory}_set to struct merge_options |  Miklos Vajna | 1 | -0/+4 |
| 2008-09-04 | merge-recursive: move the global obuf to struct merge_options | Miklos Vajna | 1 | -0/+1 |
| 2008-09-03 | merge-recursive: move call_depth to struct merge_options | Miklos Vajna | 1 | -0/+1 |
| 2008-08-30 | merge-recursive: introduce merge_options | Miklos Vajna | 1 | -13/+29 |
| 2008-08-30 | merge-recursive.c: Add more generic merge_recursive_generic() |  Stephan Beyer | 1 | -1/+3 |
| 2008-08-30 | Split out merge_recursive() to merge-recursive.c | Miklos Vajna | 1 | -1/+5 |
| 2008-02-09 | Build-in merge-recursive |  Daniel Barkalow | 1 | -0/+20 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |
path: root/merge-recursive.h