| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
* | merge-recur: virtual commits shall never be parsed | Johannes Schindelin | 2006-07-31 | 1 | -0/+2 |
* | merge-recur: use the unpack_trees() interface instead of exec()ing read-tree | Johannes Schindelin | 2006-07-30 | 1 | -28/+52 |
* | merge-recur: fix thinko in unique_path() | Johannes Schindelin | 2006-07-30 | 1 | -2/+2 |
* | merge-recur: Explain why sha_eq() and struct stage_data cannot go | Johannes Schindelin | 2006-07-27 | 1 | -5/+4 |
* | merge-recur: Cleanup last mixedCase variables... | Johannes Schindelin | 2006-07-27 | 1 | -23/+23 |
* | merge-recur: Fix compiler warning with -pedantic | Johannes Schindelin | 2006-07-27 | 1 | -1/+4 |
* | merge-recur: Remove dead code | Johannes Schindelin | 2006-07-27 | 1 | -22/+0 |
* | merge-recur: Get rid of debug code | Johannes Schindelin | 2006-07-27 | 1 | -64/+1 |
* | merge-recur: Convert variable names to lower_case | Johannes Schindelin | 2006-07-27 | 1 | -191/+189 |
* | Cumulative update of merge-recursive in C | Johannes Schindelin | 2006-07-27 | 1 | -526/+364 |
* | Merge branch 'lt/unitype' into js/c-merge-recursive | Junio C Hamano | 2006-07-13 | 1 | -1/+1 |
* | Status update on merge-recursive in C | Johannes Schindelin | 2006-07-13 | 1 | -0/+1560 |