path: root/merge-recursive.c
AgeCommit message (Expand)Author
2007-09-21nfv?asprintf are broken without va_copy, workaround them.Pierre Habouzit
2007-09-19Use xmemdupz() in many places.Pierre Habouzit
2007-09-12Move make_cache_entry() from merge-recursive.c into read-cache.cCarlos Rica
2007-08-15Use xmkstemp() instead of mkstemp()Luiz Fernando N. Capitulino
2007-08-15merge-recursive: do not rudely die on binary mergeJunio C Hamano
2007-08-10Start moving unpack-trees to "struct tree_desc"Linus Torvalds
2007-06-13-Wold-style-definition fixJunio C Hamano
2007-06-05merge-recursive: refuse to merge binary filesJohannes Schindelin
2007-04-26Ignore merged status of the file-level mergeAlex Riesen
2007-04-26Add a test for merging changed and rename-changed branchesAlex Riesen
2007-04-26Avoid excessive rewrites in merge-recursiveAlex Riesen
2007-04-22Merge branch 'jc/attr'Junio C Hamano
2007-04-21Fix bogus linked-list management for user defined merge drivers.Junio C Hamano
2007-04-20Kill the useless progress meter in merge-recursiveShawn O. Pearce
2007-04-20Fix working directory errno handling when unlinking a directoryLinus Torvalds
2007-04-19Simplify code to find recursive merge driver.Junio C Hamano
2007-04-19Counto-fix in merge-recursiveJunio C Hamano
2007-04-18Fix funny types used in attribute value representationJunio C Hamano
2007-04-18Allow low-level driver to specify different behaviour during internal merge.Junio C Hamano
2007-04-18Custom low-level merge driver: change the configuration scheme.Junio C Hamano
2007-04-18Allow the default low-level merge driver to be configured.Junio C Hamano
2007-04-18Custom low-level merge driver support.Junio C Hamano
2007-04-17Allow specifying specialized merge-backend per path.Junio C Hamano
2007-04-17merge-recursive: separate out xdl_merge() interface.Junio C Hamano
2007-04-10merge-recursive: handle D/F conflict case more carefully.Junio C Hamano
2007-04-10merge-recursive: do not barf on "to be removed" entries.Junio C Hamano
2007-04-07A new merge stragety 'subtree'.Junio C Hamano
2007-04-07Merge branch 'jc/index-output'Junio C Hamano
2007-04-05Fix bogus error message from merge-recursive error pathJunio C Hamano
2007-04-04_GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.Junio C Hamano
2007-03-31Keep rename/rename conflicts of intermediate merges while doing recursive mergeAlex Riesen
2007-03-04Handle core.symlinks=false case in merge-recursive.Johannes Sixt
2007-02-27convert object type handling from a string to a numberNicolas Pitre
2007-02-26merge-recursive: fix longstanding bug in merging symlinksJunio C Hamano
2007-02-05Use pretend_sha1_file() in git-blame and git-merge-recursive.Junio C Hamano
2007-02-04Keep untracked files not involved in a merge.Shawn O. Pearce
2007-02-04Assorted typo fixesPavel Roskin
2007-01-14Convert output messages in merge-recursive to past tense.Shawn O. Pearce
2007-01-14Display a progress meter during merge-recursive.Shawn O. Pearce
2007-01-14Enable output buffering in merge-recursive.Shawn O. Pearce
2007-01-14Allow the user to control the verbosity of merge-recursive.Shawn O. Pearce
2007-01-14Remove unnecessary call_depth parameter in merge-recursive.Shawn O. Pearce
2007-01-12merge-recursive: do not report the resulting tree object nameJunio C Hamano
2007-01-10merge-recursive: do not use on-file index when not needed.Junio C Hamano
2007-01-10Speed-up recursive by flushing index only once for all entriesAlex Riesen
2007-01-08short i/o: fix calls to write to use xwrite or write_in_fullAndy Whitcroft
2006-12-29Allow merging bare trees in merge-recursive.Shawn O. Pearce
2006-12-29Move better_branch_name above get_ref in merge-recursive.Shawn O. Pearce
2006-12-23Display 'theirs' branch name when possible in merge.Shawn O. Pearce
2006-12-23Use extended SHA1 syntax in merge-recursive conflicts.Shawn O. Pearce