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