| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
* | merge-recursive: do not use on-file index when not needed. | Junio C Hamano | 2007-01-10 | 1 | -123/+46 |
* | Speed-up recursive by flushing index only once for all entries | Alex Riesen | 2007-01-10 | 1 | -5/+2 |
* | short i/o: fix calls to write to use xwrite or write_in_full | Andy Whitcroft | 2007-01-08 | 1 | -1/+1 |
* | Allow merging bare trees in merge-recursive. | Shawn O. Pearce | 2006-12-28 | 1 | -0/+3 |
* | Move better_branch_name above get_ref in merge-recursive. | Shawn O. Pearce | 2006-12-28 | 1 | -12/+12 |
* | Display 'theirs' branch name when possible in merge. | Shawn O. Pearce | 2006-12-23 | 1 | -1/+16 |
* | Use extended SHA1 syntax in merge-recursive conflicts. | Shawn O. Pearce | 2006-12-23 | 1 | -2/+2 |
* | Merge branch 'jc/clone' | Junio C Hamano | 2006-12-20 | 1 | -1/+1 |
|\ |
|
| * | Use preprocessor constants for environment variable names. | Junio C Hamano | 2006-12-19 | 1 | -1/+1 |
* | | simplify inclusion of system header files. | Junio C Hamano | 2006-12-20 | 1 | -7/+0 |
|/ |
|
* | Merge branch 'js/merge' | Junio C Hamano | 2006-12-13 | 1 | -86/+56 |
|\ |
|
| * | merge-recursive: add/add really is modify/modify with an empty base | Johannes Schindelin | 2006-12-12 | 1 | -29/+15 |
| * | Merge branch 'master' into js/merge | Junio C Hamano | 2006-12-12 | 1 | -1/+1 |
| |\ |
|
| * | | merge-recursive: use xdl_merge(). | Junio C Hamano | 2006-12-02 | 1 | -57/+41 |
* | | | Remove uncontested renamed files during merge. | Shawn Pearce | 2006-12-13 | 1 | -1/+1 |
| |/
|/| |
|
* | | Make sure the empty tree exists when needed in merge-recursive. | Shawn O. Pearce | 2006-12-11 | 1 | -1/+1 |
|/ |
|
* | Merge branch 'jc/read-tree' | Junio C Hamano | 2006-11-07 | 1 | -33/+33 |
|\ |
|
| * | merge-recursive: adjust to loosened "working file clobbered" check | Junio C Hamano | 2006-10-27 | 1 | -21/+20 |
| * | merge-recursive: make a few functions static. | Junio C Hamano | 2006-10-27 | 1 | -12/+13 |
| * | merge-recursive: use abbreviated commit object name. | Junio C Hamano | 2006-10-27 | 1 | -1/+1 |
* | | merge-recursive implicitely depends on trust_executable_bit | Alex Riesen | 2006-11-06 | 1 | -0/+1 |
|/ |
|
* | Add hash_sha1_file() | Rene Scharfe | 2006-10-14 | 1 | -4/+1 |
* | Replace uses of strdup with xstrdup. | Shawn Pearce | 2006-09-02 | 1 | -7/+7 |
* | Use xmalloc instead of malloc | Jonas Fonseca | 2006-08-31 | 1 | -3/+3 |
* | hashcpy/hashcmp remaining bits. | Junio C Hamano | 2006-08-23 | 1 | -6/+4 |
* | Convert memcpy(a,b,20) to hashcpy(a,b). | Shawn Pearce | 2006-08-23 | 1 | -10/+10 |
* | Merge branch 'master' into js/c-merge-recursive | Junio C Hamano | 2006-08-12 | 1 | -3/+1 |
* | merge-recur: do not die unnecessarily | Johannes Schindelin | 2006-08-09 | 1 | -2/+4 |
* | merge-recur: try to merge older merge bases first | Johannes Schindelin | 2006-08-09 | 1 | -1/+12 |
* | merge-recur: if there is no common ancestor, fake empty one | Johannes Schindelin | 2006-08-09 | 1 | -0/+12 |
* | merge-recur: do not setenv("GIT_INDEX_FILE") | Johannes Schindelin | 2006-08-09 | 1 | -13/+9 |
* | merge-recur: do not call git-write-tree | Johannes Schindelin | 2006-08-09 | 1 | -24/+20 |
* | merge-recursive: fix rename handling | Johannes Schindelin | 2006-08-04 | 1 | -2/+4 |