summaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
* Handle core.symlinks=false case in merge-recursive.Johannes Sixt2007-03-031-1/+2
* convert object type handling from a string to a numberNicolas Pitre2007-02-271-7/+7
* merge-recursive: fix longstanding bug in merging symlinksJunio C Hamano2007-02-251-1/+1
* Use pretend_sha1_file() in git-blame and git-merge-recursive.Junio C Hamano2007-02-051-1/+1
* Keep untracked files not involved in a merge.Shawn O. Pearce2007-02-031-1/+1
* Assorted typo fixesPavel Roskin2007-02-031-4/+4
* Convert output messages in merge-recursive to past tense.Shawn O. Pearce2007-01-141-18/+18
* Display a progress meter during merge-recursive.Shawn O. Pearce2007-01-141-7/+66
* Enable output buffering in merge-recursive.Shawn O. Pearce2007-01-141-1/+39
* Allow the user to control the verbosity of merge-recursive.Shawn O. Pearce2007-01-141-38/+62
* Remove unnecessary call_depth parameter in merge-recursive.Shawn O. Pearce2007-01-141-9/+7
* merge-recursive: do not report the resulting tree object nameJunio C Hamano2007-01-121-6/+3
* merge-recursive: do not use on-file index when not needed.Junio C Hamano2007-01-101-123/+46
* Speed-up recursive by flushing index only once for all entriesAlex Riesen2007-01-101-5/+2
* short i/o: fix calls to write to use xwrite or write_in_fullAndy Whitcroft2007-01-081-1/+1
* Allow merging bare trees in merge-recursive.Shawn O. Pearce2006-12-281-0/+3
* Move better_branch_name above get_ref in merge-recursive.Shawn O. Pearce2006-12-281-12/+12
* Display 'theirs' branch name when possible in merge.Shawn O. Pearce2006-12-231-1/+16
* Use extended SHA1 syntax in merge-recursive conflicts.Shawn O. Pearce2006-12-231-2/+2
* Merge branch 'jc/clone'Junio C Hamano2006-12-201-1/+1
|\
| * Use preprocessor constants for environment variable names.Junio C Hamano2006-12-191-1/+1
* | simplify inclusion of system header files.Junio C Hamano2006-12-201-7/+0
|/
* Merge branch 'js/merge'Junio C Hamano2006-12-131-86/+56
|\
| * merge-recursive: add/add really is modify/modify with an empty baseJohannes Schindelin2006-12-121-29/+15
| * Merge branch 'master' into js/mergeJunio C Hamano2006-12-121-1/+1
| |\
| * | merge-recursive: use xdl_merge().Junio C Hamano2006-12-021-57/+41
* | | Remove uncontested renamed files during merge.Shawn Pearce2006-12-131-1/+1
| |/ |/|
* | Make sure the empty tree exists when needed in merge-recursive.Shawn O. Pearce2006-12-111-1/+1
|/
* Merge branch 'jc/read-tree'Junio C Hamano2006-11-071-33/+33
|\
| * merge-recursive: adjust to loosened "working file clobbered" checkJunio C Hamano2006-10-271-21/+20
| * merge-recursive: make a few functions static.Junio C Hamano2006-10-271-12/+13
| * merge-recursive: use abbreviated commit object name.Junio C Hamano2006-10-271-1/+1
* | merge-recursive implicitely depends on trust_executable_bitAlex Riesen2006-11-061-0/+1
|/
* Add hash_sha1_file()Rene Scharfe2006-10-141-4/+1
* Replace uses of strdup with xstrdup.Shawn Pearce2006-09-021-7/+7
* Use xmalloc instead of mallocJonas Fonseca2006-08-311-3/+3
* hashcpy/hashcmp remaining bits.Junio C Hamano2006-08-231-6/+4
* Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce2006-08-231-10/+10
* Merge branch 'master' into js/c-merge-recursiveJunio C Hamano2006-08-121-3/+1
* merge-recur: do not die unnecessarilyJohannes Schindelin2006-08-091-2/+4
* merge-recur: try to merge older merge bases firstJohannes Schindelin2006-08-091-1/+12
* merge-recur: if there is no common ancestor, fake empty oneJohannes Schindelin2006-08-091-0/+12
* merge-recur: do not setenv("GIT_INDEX_FILE")Johannes Schindelin2006-08-091-13/+9
* merge-recur: do not call git-write-treeJohannes Schindelin2006-08-091-24/+20
* merge-recursive: fix rename handlingJohannes Schindelin2006-08-041-2/+4
* merge-recur: virtual commits shall never be parsedJohannes Schindelin2006-07-311-0/+2
* merge-recur: use the unpack_trees() interface instead of exec()ing read-treeJohannes Schindelin2006-07-301-28/+52
* merge-recur: fix thinko in unique_path()Johannes Schindelin2006-07-301-2/+2
* merge-recur: Explain why sha_eq() and struct stage_data cannot goJohannes Schindelin2006-07-271-5/+4
* merge-recur: Cleanup last mixedCase variables...Johannes Schindelin2006-07-271-23/+23
View Lorry Controller Status