| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'bc/master-diff-hunk-header-fix' | Shawn O. Pearce | 2008-09-29 | 1 | -16/+1 |
|\ |
|
* \ | Merge branch 'maint' | Shawn O. Pearce | 2008-09-26 | 1 | -3/+1 |
|\ \
| |/ |
|
* | | Cleanup remove_path | Alex Riesen | 2008-09-26 | 1 | -5/+3 |
* | | merge-recursive: get rid of virtual_id | Miklos Vajna | 2008-09-05 | 1 | -5/+1 |
* | | merge-recursive: move current_{file,directory}_set to struct merge_options | Miklos Vajna | 2008-09-04 | 1 | -27/+30 |
* | | merge-recursive: move the global obuf to struct merge_options | Miklos Vajna | 2008-09-04 | 1 | -19/+18 |
* | | merge-recursive: get rid of the index_only global variable | Miklos Vajna | 2008-09-04 | 1 | -73/+67 |
* | | merge-recursive: move call_depth to struct merge_options | Miklos Vajna | 2008-09-03 | 1 | -13/+12 |
* | | merge-recursive: introduce merge_options | Miklos Vajna | 2008-08-30 | 1 | -132/+133 |
* | | merge-recursive.c: Add more generic merge_recursive_generic() | Stephan Beyer | 2008-08-30 | 1 | -0/+53 |
* | | Split out merge_recursive() to merge-recursive.c | Miklos Vajna | 2008-08-30 | 1 | -0/+1331 |
|/ |
|
* | Build-in merge-recursive | Daniel Barkalow | 2008-02-09 | 1 | -1760/+0 |
* | Make on-disk index representation separate from in-core one | Linus Torvalds | 2008-01-21 | 1 | -1/+1 |
* | Improve use of lockfile API | Brandon Casey | 2008-01-16 | 1 | -1/+1 |
* | Fix grammar nits in documentation and in code comments. | Jim Meyering | 2008-01-03 | 1 | -1/+1 |
* | Improved submodule merge support | Finn Arne Gangstad | 2007-12-19 | 1 | -1/+8 |
* | Support a merge with conflicting gitlink change | Junio C Hamano | 2007-12-11 | 1 | -4/+6 |
* | Make the diff_options bitfields be an unsigned with explicit masks. | Pierre Habouzit | 2007-11-11 | 1 | -1/+1 |
* | Merge branch 'maint' | Junio C Hamano | 2007-10-29 | 1 | -1/+1 |
|\ |
|
| * | merge-recursive.c: mrtree in merge() is not used before set | Junio C Hamano | 2007-10-29 | 1 | -1/+1 |
| * | Move make_cache_entry() from merge-recursive.c into read-cache.c | Carlos Rica | 2007-09-26 | 1 | -24/+0 |
* | | Merge branch 'ph/strbuf' | Junio C Hamano | 2007-10-03 | 1 | -55/+39 |
|\ \ |
|
| * | | nfv?asprintf are broken without va_copy, workaround them. | Pierre Habouzit | 2007-09-20 | 1 | -40/+35 |
| * | | Use xmemdupz() in many places. | Pierre Habouzit | 2007-09-18 | 1 | -15/+4 |
* | | | Make merge-recursive honor diff.renamelimit | Lars Hjemli | 2007-09-25 | 1 | -0/+6 |
|/ / |
|
* | | Move make_cache_entry() from merge-recursive.c into read-cache.c | Carlos Rica | 2007-09-12 | 1 | -24/+0 |
|/ |
|
* | Use xmkstemp() instead of mkstemp() | Luiz Fernando N. Capitulino | 2007-08-14 | 1 | -3/+1 |
* | merge-recursive: do not rudely die on binary merge | Junio C Hamano | 2007-08-14 | 1 | -23/+28 |
* | Start moving unpack-trees to "struct tree_desc" | Linus Torvalds | 2007-08-10 | 1 | -5/+11 |
* | -Wold-style-definition fix | Junio C Hamano | 2007-06-13 | 1 | -1/+1 |
* | merge-recursive: refuse to merge binary files | Johannes Schindelin | 2007-06-04 | 1 | -0/+6 |
* | Ignore merged status of the file-level merge | Alex Riesen | 2007-04-26 | 1 | -1/+1 |
* | Add a test for merging changed and rename-changed branches | Alex Riesen | 2007-04-25 | 1 | -0/+5 |
* | Avoid excessive rewrites in merge-recursive | Alex Riesen | 2007-04-25 | 1 | -13/+19 |
* | Merge branch 'jc/attr' | Junio C Hamano | 2007-04-21 | 1 | -21/+382 |
|\ |
|
| * | Fix bogus linked-list management for user defined merge drivers. | Junio C Hamano | 2007-04-21 | 1 | -1/+2 |
| * | Simplify code to find recursive merge driver. | Junio C Hamano | 2007-04-18 | 1 | -7/+2 |
| * | Counto-fix in merge-recursive | Junio C Hamano | 2007-04-18 | 1 | -1/+4 |
| * | Fix funny types used in attribute value representation | Junio C Hamano | 2007-04-18 | 1 | -7/+10 |
| * | Allow low-level driver to specify different behaviour during internal merge. | Junio C Hamano | 2007-04-18 | 1 | -0/+12 |
| * | Custom low-level merge driver: change the configuration scheme. | Junio C Hamano | 2007-04-18 | 1 | -77/+125 |
| * | Allow the default low-level merge driver to be configured. | Junio C Hamano | 2007-04-18 | 1 | -2/+12 |
| * | Custom low-level merge driver support. | Junio C Hamano | 2007-04-18 | 1 | -12/+165 |
| * | Allow specifying specialized merge-backend per path. | Junio C Hamano | 2007-04-17 | 1 | -7/+129 |
| * | merge-recursive: separate out xdl_merge() interface. | Junio C Hamano | 2007-04-17 | 1 | -21/+35 |
* | | Kill the useless progress meter in merge-recursive | Shawn O. Pearce | 2007-04-20 | 1 | -62/+3 |
* | | Fix working directory errno handling when unlinking a directory | Linus Torvalds | 2007-04-19 | 1 | -25/+29 |
* | | merge-recursive: handle D/F conflict case more carefully. | Junio C Hamano | 2007-04-10 | 1 | -3/+26 |
* | | merge-recursive: do not barf on "to be removed" entries. | Junio C Hamano | 2007-04-10 | 1 | -5/+11 |
|/ |
|
* | A new merge stragety 'subtree'. | Junio C Hamano | 2007-04-07 | 1 | -0/+29 |