| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | 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 |
| * | Merge branch 'jc/index-output' | Junio C Hamano | 2007-04-07 | 1 | -2/+2 |
| |\ |
|
| | * | _GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file. | Junio C Hamano | 2007-04-03 | 1 | -2/+2 |
| * | | Fix bogus error message from merge-recursive error path | Junio C Hamano | 2007-04-05 | 1 | -1/+1 |
| |/ |
|
| * | Keep rename/rename conflicts of intermediate merges while doing recursive merge | Alex Riesen | 2007-03-31 | 1 | -6/+31 |
| * | Handle core.symlinks=false case in merge-recursive. | Johannes Sixt | 2007-03-03 | 1 | -1/+2 |
| * | convert object type handling from a string to a number | Nicolas Pitre | 2007-02-27 | 1 | -7/+7 |
| * | merge-recursive: fix longstanding bug in merging symlinks | Junio C Hamano | 2007-02-25 | 1 | -1/+1 |
| * | Use pretend_sha1_file() in git-blame and git-merge-recursive. | Junio C Hamano | 2007-02-05 | 1 | -1/+1 |
| * | Keep untracked files not involved in a merge. | Shawn O. Pearce | 2007-02-03 | 1 | -1/+1 |
| * | Assorted typo fixes | Pavel Roskin | 2007-02-03 | 1 | -4/+4 |
| * | Convert output messages in merge-recursive to past tense. | Shawn O. Pearce | 2007-01-14 | 1 | -18/+18 |
| * | Display a progress meter during merge-recursive. | Shawn O. Pearce | 2007-01-14 | 1 | -7/+66 |
| * | Enable output buffering in merge-recursive. | Shawn O. Pearce | 2007-01-14 | 1 | -1/+39 |
| * | Allow the user to control the verbosity of merge-recursive. | Shawn O. Pearce | 2007-01-14 | 1 | -38/+62 |
| * | Remove unnecessary call_depth parameter in merge-recursive. | Shawn O. Pearce | 2007-01-14 | 1 | -9/+7 |
| * | merge-recursive: do not report the resulting tree object name | Junio C Hamano | 2007-01-12 | 1 | -6/+3 |
