| Age | Commit message (Expand) | Author | Files | Lines |
|---|
| 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 |
| 2007-04-18 | Fix funny types used in attribute value representation | Junio C Hamano | 1 | -7/+10 |
| 2007-04-18 | Allow low-level driver to specify different behaviour during internal merge. | Junio C Hamano | 1 | -0/+12 |
| 2007-04-18 | Custom low-level merge driver: change the configuration scheme. | Junio C Hamano | 1 | -77/+125 |
| 2007-04-18 | Allow the default low-level merge driver to be configured. | Junio C Hamano | 1 | -2/+12 |
| 2007-04-18 | Custom low-level merge driver support. | Junio C Hamano | 1 | -12/+165 |
| 2007-04-17 | Allow specifying specialized merge-backend per path. | Junio C Hamano | 1 | -7/+129 |
| 2007-04-17 | merge-recursive: separate out xdl_merge() interface. | Junio C Hamano | 1 | -21/+35 |
| 2007-04-10 | merge-recursive: handle D/F conflict case more carefully. | Junio C Hamano | 1 | -3/+26 |
| 2007-04-10 | merge-recursive: do not barf on "to be removed" entries. | Junio C Hamano | 1 | -5/+11 |
| 2007-04-07 | A new merge stragety 'subtree'. | Junio C Hamano | 1 | -0/+29 |
| 2007-04-07 | Merge branch 'jc/index-output' | Junio C Hamano | 1 | -2/+2 |
| 2007-04-05 | Fix bogus error message from merge-recursive error path | Junio C Hamano | 1 | -1/+1 |
| 2007-04-03 | _GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file. | Junio C Hamano | 1 | -2/+2 |
| 2007-03-31 | Keep rename/rename conflicts of intermediate merges while doing recursive merge | Alex Riesen | 1 | -6/+31 |
| 2007-03-03 | Handle core.symlinks=false case in merge-recursive. | Johannes Sixt | 1 | -1/+2 |
| 2007-02-27 | convert object type handling from a string to a number | Nicolas Pitre | 1 | -7/+7 |
| 2007-02-25 | merge-recursive: fix longstanding bug in merging symlinks | Junio C Hamano | 1 | -1/+1 |
| 2007-02-05 | Use pretend_sha1_file() in git-blame and git-merge-recursive. | Junio C Hamano | 1 | -1/+1 |
| 2007-02-03 | Keep untracked files not involved in a merge. | Shawn O. Pearce | 1 | -1/+1 |
| 2007-02-03 | Assorted typo fixes | Pavel Roskin | 1 | -4/+4 |
| 2007-01-14 | Convert output messages in merge-recursive to past tense. | Shawn O. Pearce | 1 | -18/+18 |
| 2007-01-14 | Display a progress meter during merge-recursive. | Shawn O. Pearce | 1 | -7/+66 |
| 2007-01-14 | Enable output buffering in merge-recursive. | Shawn O. Pearce | 1 | -1/+39 |
| 2007-01-14 | Allow the user to control the verbosity of merge-recursive. | Shawn O. Pearce | 1 | -38/+62 |
| 2007-01-14 | Remove unnecessary call_depth parameter in merge-recursive. | Shawn O. Pearce | 1 | -9/+7 |
| 2007-01-12 | merge-recursive: do not report the resulting tree object name | Junio C Hamano | 1 | -6/+3 |
| 2007-01-10 | merge-recursive: do not use on-file index when not needed. | Junio C Hamano | 1 | -123/+46 |
| 2007-01-10 | Speed-up recursive by flushing index only once for all entries | Alex Riesen | 1 | -5/+2 |
| 2007-01-08 | short i/o: fix calls to write to use xwrite or write_in_full | Andy Whitcroft | 1 | -1/+1 |
| 2006-12-28 | Allow merging bare trees in merge-recursive. | Shawn O. Pearce | 1 | -0/+3 |
| 2006-12-28 | Move better_branch_name above get_ref in merge-recursive. | Shawn O. Pearce | 1 | -12/+12 |
| 2006-12-23 | Display 'theirs' branch name when possible in merge. | Shawn O. Pearce | 1 | -1/+16 |
| 2006-12-23 | Use extended SHA1 syntax in merge-recursive conflicts. | Shawn O. Pearce | 1 | -2/+2 |
| 2006-12-20 | Merge branch 'jc/clone' | Junio C Hamano | 1 | -1/+1 |
| 2006-12-20 | simplify inclusion of system header files. | Junio C Hamano | 1 | -7/+0 |
| 2006-12-19 | Use preprocessor constants for environment variable names. | Junio C Hamano | 1 | -1/+1 |
| 2006-12-13 | Merge branch 'js/merge' | Junio C Hamano | 1 | -86/+56 |
| 2006-12-13 | Remove uncontested renamed files during merge. | Shawn Pearce | 1 | -1/+1 |
| 2006-12-12 | merge-recursive: add/add really is modify/modify with an empty base | Johannes Schindelin | 1 | -29/+15 |
| 2006-12-12 | Merge branch 'master' into js/merge | Junio C Hamano | 1 | -1/+1 |
| 2006-12-11 | Make sure the empty tree exists when needed in merge-recursive. | Shawn O. Pearce | 1 | -1/+1 |
| 2006-12-02 | merge-recursive: use xdl_merge(). | Junio C Hamano | 1 | -57/+41 |
| 2006-11-07 | Merge branch 'jc/read-tree' | Junio C Hamano | 1 | -33/+33 |
| 2006-11-06 | merge-recursive implicitely depends on trust_executable_bit | Alex Riesen | 1 | -0/+1 |
| 2006-10-27 | merge-recursive: adjust to loosened "working file clobbered" check | Junio C Hamano | 1 | -21/+20 |
| 2006-10-27 | merge-recursive: make a few functions static. | Junio C Hamano | 1 | -12/+13 |
| 2006-10-27 | merge-recursive: use abbreviated commit object name. | Junio C Hamano | 1 | -1/+1 |
| 2006-10-14 | Add hash_sha1_file() | Rene Scharfe | 1 | -4/+1 |
| 2006-09-02 | Replace uses of strdup with xstrdup. | Shawn Pearce | 1 | -7/+7 |
| 2006-08-31 | Use xmalloc instead of malloc | Jonas Fonseca | 1 | -3/+3 |
| 2006-08-23 | hashcpy/hashcmp remaining bits. | Junio C Hamano | 1 | -6/+4 |
| 2006-08-23 | Convert memcpy(a,b,20) to hashcpy(a,b). | Shawn Pearce | 1 | -10/+10 |
| 2006-08-12 | Merge branch 'master' into js/c-merge-recursive | Junio C Hamano | 1 | -3/+1 |
| 2006-08-09 | merge-recur: do not die unnecessarily | Johannes Schindelin | 1 | -2/+4 |
| 2006-08-09 | merge-recur: try to merge older merge bases first | Johannes Schindelin | 1 | -1/+12 |
| 2006-08-09 | merge-recur: if there is no common ancestor, fake empty one | Johannes Schindelin | 1 | -0/+12 |
| 2006-08-09 | merge-recur: do not setenv("GIT_INDEX_FILE") | Johannes Schindelin | 1 | -13/+9 |
| 2006-08-09 | merge-recur: do not call git-write-tree | Johannes Schindelin | 1 | -24/+20 |
| 2006-08-04 | merge-recursive: fix rename handling | Johannes Schindelin | 1 | -2/+4 |
| 2006-07-31 | merge-recur: virtual commits shall never be parsed | Johannes Schindelin | 1 | -0/+2 |
| 2006-07-30 | merge-recur: use the unpack_trees() interface instead of exec()ing read-tree | Johannes Schindelin | 1 | -28/+52 |
| 2006-07-30 | merge-recur: fix thinko in unique_path() | Johannes Schindelin | 1 | -2/+2 |
| 2006-07-27 | merge-recur: Explain why sha_eq() and struct stage_data cannot go | Johannes Schindelin | 1 | -5/+4 |
| 2006-07-27 | merge-recur: Cleanup last mixedCase variables... | Johannes Schindelin | 1 | -23/+23 |
| 2006-07-27 | merge-recur: Fix compiler warning with -pedantic | Johannes Schindelin | 1 | -1/+4 |
| 2006-07-27 | merge-recur: Remove dead code | Johannes Schindelin | 1 | -22/+0 |
| 2006-07-27 | merge-recur: Get rid of debug code | Johannes Schindelin | 1 | -64/+1 |
| 2006-07-27 | merge-recur: Convert variable names to lower_case | Johannes Schindelin | 1 | -191/+189 |
| 2006-07-27 | Cumulative update of merge-recursive in C | Johannes Schindelin | 1 | -526/+364 |
| 2006-07-13 | Merge branch 'lt/unitype' into js/c-merge-recursive | Junio C Hamano | 1 | -1/+1 |
| 2006-07-13 | Status update on merge-recursive in C | Johannes Schindelin | 1 | -0/+1560 |
