aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAge
* Keep rename/rename conflicts of intermediate merges while doing recursive mergeAlex Riesen2007-03-31
* Handle core.symlinks=false case in merge-recursive.Johannes Sixt2007-03-03
* convert object type handling from a string to a numberNicolas Pitre2007-02-27
* merge-recursive: fix longstanding bug in merging symlinksJunio C Hamano2007-02-25
* Use pretend_sha1_file() in git-blame and git-merge-recursive.Junio C Hamano2007-02-05
* Keep untracked files not involved in a merge.Shawn O. Pearce2007-02-03
* Assorted typo fixesPavel Roskin2007-02-03
* Convert output messages in merge-recursive to past tense.Shawn O. Pearce2007-01-14
* Display a progress meter during merge-recursive.Shawn O. Pearce2007-01-14
* Enable output buffering in merge-recursive.Shawn O. Pearce2007-01-14
* Allow the user to control the verbosity of merge-recursive.Shawn O. Pearce2007-01-14
* Remove unnecessary call_depth parameter in merge-recursive.Shawn O. Pearce2007-01-14
* merge-recursive: do not report the resulting tree object nameJunio C Hamano2007-01-12
* merge-recursive: do not use on-file index when not needed.Junio C Hamano2007-01-10
* Speed-up recursive by flushing index only once for all entriesAlex Riesen2007-01-10
* short i/o: fix calls to write to use xwrite or write_in_fullAndy Whitcroft2007-01-08
* Allow merging bare trees in merge-recursive.Shawn O. Pearce2006-12-28
* Move better_branch_name above get_ref in merge-recursive.Shawn O. Pearce2006-12-28
* Display 'theirs' branch name when possible in merge.Shawn O. Pearce2006-12-23
* Use extended SHA1 syntax in merge-recursive conflicts.Shawn O. Pearce2006-12-23
* Merge branch 'jc/clone'Junio C Hamano2006-12-20
|\
| * Use preprocessor constants for environment variable names.Junio C Hamano2006-12-19
* | simplify inclusion of system header files.Junio C Hamano2006-12-20
|/
* Merge branch 'js/merge'Junio C Hamano2006-12-13
|\
| * merge-recursive: add/add really is modify/modify with an empty baseJohannes Schindelin2006-12-12
| * Merge branch 'master' into js/mergeJunio C Hamano2006-12-12
| |\
| * | merge-recursive: use xdl_merge().Junio C Hamano2006-12-02
* | | Remove uncontested renamed files during merge.Shawn Pearce2006-12-13
| |/ |/|
* | Make sure the empty tree exists when needed in merge-recursive.Shawn O. Pearce2006-12-11
|/
* Merge branch 'jc/read-tree'Junio C Hamano2006-11-07
|\
| * merge-recursive: adjust to loosened "working file clobbered" checkJunio C Hamano2006-10-27
| * merge-recursive: make a few functions static.Junio C Hamano2006-10-27
| * merge-recursive: use abbreviated commit object name.Junio C Hamano2006-10-27
* | merge-recursive implicitely depends on trust_executable_bitAlex Riesen2006-11-06
|/
* Add hash_sha1_file()Rene Scharfe2006-10-14
* Replace uses of strdup with xstrdup.Shawn Pearce2006-09-02
* Use xmalloc instead of mallocJonas Fonseca2006-08-31
* hashcpy/hashcmp remaining bits.Junio C Hamano2006-08-23
* Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce2006-08-23
* Merge branch 'master' into js/c-merge-recursiveJunio C Hamano2006-08-12
* merge-recur: do not die unnecessarilyJohannes Schindelin2006-08-09
* merge-recur: try to merge older merge bases firstJohannes Schindelin2006-08-09
* merge-recur: if there is no common ancestor, fake empty oneJohannes Schindelin2006-08-09
* merge-recur: do not setenv("GIT_INDEX_FILE")Johannes Schindelin2006-08-09
* merge-recur: do not call git-write-treeJohannes Schindelin2006-08-09
* merge-recursive: fix rename handlingJohannes Schindelin2006-08-04
* merge-recur: virtual commits shall never be parsedJohannes Schindelin2006-07-31
* merge-recur: use the unpack_trees() interface instead of exec()ing read-treeJohannes Schindelin2006-07-30
* merge-recur: fix thinko in unique_path()Johannes Schindelin2006-07-30
* merge-recur: Explain why sha_eq() and struct stage_data cannot goJohannes Schindelin2006-07-27
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-16 06:04:33 +0000