Age | Commit message (Expand) | Author | Files | Lines |
2009-04-05 | simplify output of conflicting merge | Clemens Buchacher | 1 | -13/+4 |
2009-04-05 | update cache for conflicting submodule entries | Clemens Buchacher | 1 | -2/+3 |
2009-02-07 | tree.c: allow read_tree_recursive() to traverse gitlink entries | Lars Hjemli | 1 | -1/+1 |
2009-01-07 | Merge branch 'js/maint-merge-recursive-r-d-conflict' | Junio C Hamano | 1 | -0/+5 |
2008-12-24 | merge-recursive: mark rename/delete conflict as unmerged | Johannes Schindelin | 1 | -0/+5 |
2008-12-15 | Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fix | Junio C Hamano | 1 | -0/+32 |
2008-12-04 | Report symlink failures in merge-recursive | Alex Riesen | 1 | -1/+2 |
2008-11-23 | merge-recursive: use strbuf_expand() instead of interpolate() | René Scharfe | 1 | -1/+0 |
2008-10-19 | git-merge-recursive: honor merge.conflictstyle once again | Matt McCutchen | 1 | -1/+1 |
2008-10-12 | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer | Brandon Casey | 1 | -2/+1 |
2008-09-29 | Merge branch 'bc/master-diff-hunk-header-fix' | Shawn O. Pearce | 1 | -16/+1 |
2008-09-26 | Merge branch 'maint' | Shawn O. Pearce | 1 | -3/+1 |
2008-09-26 | Cleanup remove_path | Alex Riesen | 1 | -5/+3 |
2008-09-05 | merge-recursive: get rid of virtual_id | Miklos Vajna | 1 | -5/+1 |
2008-09-04 | merge-recursive: move current_{file,directory}_set to struct merge_options | Miklos Vajna | 1 | -27/+30 |
2008-09-04 | merge-recursive: move the global obuf to struct merge_options | Miklos Vajna | 1 | -19/+18 |
2008-09-04 | merge-recursive: get rid of the index_only global variable | Miklos Vajna | 1 | -73/+67 |
2008-09-03 | merge-recursive: move call_depth to struct merge_options | Miklos Vajna | 1 | -13/+12 |
2008-08-30 | merge-recursive: introduce merge_options | Miklos Vajna | 1 | -132/+133 |
2008-08-30 | merge-recursive.c: Add more generic merge_recursive_generic() | Stephan Beyer | 1 | -0/+53 |
2008-08-30 | Split out merge_recursive() to merge-recursive.c | Miklos Vajna | 1 | -0/+1331 |
2008-02-09 | Build-in merge-recursive | Daniel Barkalow | 1 | -1760/+0 |
2008-01-21 | Make on-disk index representation separate from in-core one | Linus Torvalds | 1 | -1/+1 |
2008-01-16 | Improve use of lockfile API | Brandon Casey | 1 | -1/+1 |
2008-01-03 | Fix grammar nits in documentation and in code comments. | Jim Meyering | 1 | -1/+1 |
2007-12-19 | Improved submodule merge support | Finn Arne Gangstad | 1 | -1/+8 |
2007-12-11 | Support a merge with conflicting gitlink change | Junio C Hamano | 1 | -4/+6 |
2007-11-11 | Make the diff_options bitfields be an unsigned with explicit masks. | Pierre Habouzit | 1 | -1/+1 |
2007-10-29 | Merge branch 'maint' | Junio C Hamano | 1 | -1/+1 |
2007-10-29 | merge-recursive.c: mrtree in merge() is not used before set | Junio C Hamano | 1 | -1/+1 |
2007-10-03 | Merge branch 'ph/strbuf' | Junio C Hamano | 1 | -55/+39 |
2007-09-26 | Move make_cache_entry() from merge-recursive.c into read-cache.c | Carlos Rica | 1 | -24/+0 |
2007-09-25 | Make merge-recursive honor diff.renamelimit | Lars Hjemli | 1 | -0/+6 |
2007-09-20 | nfv?asprintf are broken without va_copy, workaround them. | Pierre Habouzit | 1 | -40/+35 |
2007-09-18 | Use xmemdupz() in many places. | Pierre Habouzit | 1 | -15/+4 |
2007-09-12 | Move make_cache_entry() from merge-recursive.c into read-cache.c | Carlos Rica | 1 | -24/+0 |
2007-08-14 | Use xmkstemp() instead of mkstemp() | Luiz Fernando N. Capitulino | 1 | -3/+1 |
2007-08-14 | merge-recursive: do not rudely die on binary merge | Junio C Hamano | 1 | -23/+28 |
2007-08-10 | Start moving unpack-trees to "struct tree_desc" | Linus Torvalds | 1 | -5/+11 |
2007-06-13 | -Wold-style-definition fix | Junio C Hamano | 1 | -1/+1 |
2007-06-04 | merge-recursive: refuse to merge binary files | Johannes Schindelin | 1 | -0/+6 |
2007-04-26 | Ignore merged status of the file-level merge | Alex Riesen | 1 | -1/+1 |
2007-04-25 | Add a test for merging changed and rename-changed branches | Alex Riesen | 1 | -0/+5 |
2007-04-25 | Avoid excessive rewrites in merge-recursive | Alex Riesen | 1 | -13/+19 |
2007-04-21 | Merge branch 'jc/attr' | Junio C Hamano | 1 | -21/+382 |
2007-04-21 | Fix bogus linked-list management for user defined merge drivers. | Junio C Hamano | 1 | -1/+2 |
2007-04-20 | Kill the useless progress meter in merge-recursive | Shawn O. Pearce | 1 | -62/+3 |
2007-04-19 | Fix working directory errno handling when unlinking a directory | Linus Torvalds | 1 | -25/+29 |
2007-04-18 | Simplify code to find recursive merge driver. | Junio C Hamano | 1 | -7/+2 |
2007-04-18 | Counto-fix in merge-recursive | Junio C Hamano | 1 | -1/+4 |