| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | git merge -X<option> | Avery Pennarun | 2010-01-17 | 1 | -1/+5 |
| * | 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 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |
path: root/merge-recursive.h