| Age | Commit message (Expand) | Author | Files | Lines |
|---|
| 2010-02-22 | Move 'builtin-*' into a 'builtin/' subdirectory | Linus Torvalds | 1 | -84/+0 |
| 2010-01-17 | Make "subtree" part more orthogonal to the rest of merge-recursive. | Junio C Hamano | 1 | -5/+5 |
| 2010-01-17 | git merge -X<option> | Avery Pennarun | 1 | -6/+17 |
| 2009-11-10 | merge-{recursive,subtree}: use usagef() to print usage | Jonathan Nieder | 1 | -1/+1 |
| 2009-05-23 | MinGW: Fix compiler warning in merge-recursive | Johannes Schindelin | 1 | -2/+3 |
| 2009-01-05 | remove trailing LF in die() messages | Alexander Potashev | 1 | -1/+1 |
| 2008-08-30 | merge-recursive: introduce merge_options | Miklos Vajna | 1 | -21/+22 |
| 2008-08-30 | merge-recursive.c: Add more generic merge_recursive_generic() | Stephan Beyer | 1 | -45/+19 |
| 2008-08-30 | Split out merge_recursive() to merge-recursive.c | Miklos Vajna | 1 | -1323/+4 |
| 2008-08-22 | Revert "Convert output messages in merge-recursive to past tense." | Jonathan del Strother | 1 | -18/+18 |
| 2008-07-21 | Rename path_list to string_list | Johannes Schindelin | 1 | -48/+48 |
| 2008-07-16 | Merge branch 'rs/archive' | Junio C Hamano | 1 | -2/+2 |
| 2008-07-15 | add context pointer to read_tree_recursive() | René Scharfe | 1 | -2/+2 |
| 2008-06-30 | Move commit_list_count() to commit.c | Miklos Vajna | 1 | -8/+0 |
| 2008-06-24 | clone: create intermediate directories of destination repo | Jeff King | 1 | -11/+2 |
| 2008-06-09 | Merge branch 'js/merge-recursive' | Junio C Hamano | 1 | -0/+11 |
| 2008-06-09 | merge-recursive: respect core.autocrlf when writing out the result | Johannes Schindelin | 1 | -0/+11 |
| 2008-05-25 | Merge branch 'js/config-cb'v1.5.6-rc0 | Junio C Hamano | 1 | -3/+3 |
| 2008-05-14 | Provide git_config with a callback-data parameter | Johannes Schindelin | 1 | -3/+3 |
| 2008-05-03 | diff: make "too many files" rename warning optional | Jeff King | 1 | -0/+1 |
| 2008-05-03 | bump rename limit defaults | Jeff King | 1 | -1/+1 |
| 2008-05-03 | add merge.renamelimit config option | Jeff King | 1 | -3/+10 |
| 2008-03-14 | Merge branch 'maint' | Junio C Hamano | 1 | -2/+13 |
| 2008-03-11 | Merge branch 'lt/unpack-trees' | Junio C Hamano | 1 | -0/+2 |
| 2008-03-11 | Merge branch 'jc/cherry-pick' (early part) | Junio C Hamano | 1 | -365/+12 |
| 2008-03-09 | Make 'unpack_trees()' have a separate source and destination index | Linus Torvalds | 1 | -1/+2 |
| 2008-03-09 | Make 'unpack_trees()' take the index to work on as an argument | Linus Torvalds | 1 | -0/+1 |
| 2008-02-27 | Merge branch 'db/checkout' | Junio C Hamano | 1 | -0/+1754 |
| 2008-02-09 | Library function to check for unmerged index entries | Daniel Barkalow | 1 | -13/+2 |
| 2008-02-09 | Build-in merge-recursive | Daniel Barkalow | 1 | -0/+1762 |
