summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2007-06-13-Wold-style-definition fixLibravatar Junio C Hamano1-1/+1
2007-06-04merge-recursive: refuse to merge binary filesLibravatar Johannes Schindelin1-0/+6
2007-04-26Ignore merged status of the file-level mergeLibravatar Alex Riesen1-1/+1
2007-04-25Add a test for merging changed and rename-changed branchesLibravatar Alex Riesen1-0/+5
2007-04-25Avoid excessive rewrites in merge-recursiveLibravatar Alex Riesen1-13/+19
2007-04-21Merge branch 'jc/attr'Libravatar Junio C Hamano1-21/+382
2007-04-21Fix bogus linked-list management for user defined merge drivers.Libravatar Junio C Hamano1-1/+2
2007-04-20Kill the useless progress meter in merge-recursiveLibravatar Shawn O. Pearce1-62/+3
2007-04-19Fix working directory errno handling when unlinking a directoryLibravatar Linus Torvalds1-25/+29
2007-04-18Simplify code to find recursive merge driver.Libravatar Junio C Hamano1-7/+2
2007-04-18Counto-fix in merge-recursiveLibravatar Junio C Hamano1-1/+4
2007-04-18Fix funny types used in attribute value representationLibravatar Junio C Hamano1-7/+10
2007-04-18Allow low-level driver to specify different behaviour during internal merge.Libravatar Junio C Hamano1-0/+12
2007-04-18Custom low-level merge driver: change the configuration scheme.Libravatar Junio C Hamano1-77/+125
2007-04-18Allow the default low-level merge driver to be configured.Libravatar Junio C Hamano1-2/+12
2007-04-18Custom low-level merge driver support.Libravatar Junio C Hamano1-12/+165
2007-04-17Allow specifying specialized merge-backend per path.Libravatar Junio C Hamano1-7/+129
2007-04-17merge-recursive: separate out xdl_merge() interface.Libravatar Junio C Hamano1-21/+35
2007-04-10merge-recursive: handle D/F conflict case more carefully.Libravatar Junio C Hamano1-3/+26
2007-04-10merge-recursive: do not barf on "to be removed" entries.Libravatar Junio C Hamano1-5/+11
2007-04-07A new merge stragety 'subtree'.Libravatar Junio C Hamano1-0/+29
2007-04-07Merge branch 'jc/index-output'Libravatar Junio C Hamano1-2/+2
2007-04-05Fix bogus error message from merge-recursive error pathLibravatar Junio C Hamano1-1/+1
2007-04-03_GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.Libravatar Junio C Hamano1-2/+2
2007-03-31Keep rename/rename conflicts of intermediate merges while doing recursive mergeLibravatar Alex Riesen1-6/+31
2007-03-03Handle core.symlinks=false case in merge-recursive.Libravatar Johannes Sixt1-1/+2
2007-02-27convert object type handling from a string to a numberLibravatar Nicolas Pitre1-7/+7
2007-02-25merge-recursive: fix longstanding bug in merging symlinksLibravatar Junio C Hamano1-1/+1
2007-02-05Use pretend_sha1_file() in git-blame and git-merge-recursive.Libravatar Junio C Hamano1-1/+1
2007-02-03Keep untracked files not involved in a merge.Libravatar Shawn O. Pearce1-1/+1
2007-02-03Assorted typo fixesLibravatar Pavel Roskin1-4/+4
2007-01-14Convert output messages in merge-recursive to past tense.Libravatar Shawn O. Pearce1-18/+18
2007-01-14Display a progress meter during merge-recursive.Libravatar Shawn O. Pearce1-7/+66
2007-01-14Enable output buffering in merge-recursive.Libravatar Shawn O. Pearce1-1/+39
2007-01-14Allow the user to control the verbosity of merge-recursive.Libravatar Shawn O. Pearce1-38/+62
2007-01-14Remove unnecessary call_depth parameter in merge-recursive.Libravatar Shawn O. Pearce1-9/+7
2007-01-12merge-recursive: do not report the resulting tree object nameLibravatar Junio C Hamano1-6/+3
2007-01-10merge-recursive: do not use on-file index when not needed.Libravatar Junio C Hamano1-123/+46
2007-01-10Speed-up recursive by flushing index only once for all entriesLibravatar Alex Riesen1-5/+2
2007-01-08short i/o: fix calls to write to use xwrite or write_in_fullLibravatar Andy Whitcroft1-1/+1
2006-12-28Allow merging bare trees in merge-recursive.Libravatar Shawn O. Pearce1-0/+3
2006-12-28Move better_branch_name above get_ref in merge-recursive.Libravatar Shawn O. Pearce1-12/+12
2006-12-23Display 'theirs' branch name when possible in merge.Libravatar Shawn O. Pearce1-1/+16
2006-12-23Use extended SHA1 syntax in merge-recursive conflicts.Libravatar Shawn O. Pearce1-2/+2
2006-12-20Merge branch 'jc/clone'Libravatar Junio C Hamano1-1/+1
2006-12-20simplify inclusion of system header files.Libravatar Junio C Hamano1-7/+0
2006-12-19Use preprocessor constants for environment variable names.Libravatar Junio C Hamano1-1/+1
2006-12-13Merge branch 'js/merge'Libravatar Junio C Hamano1-86/+56
2006-12-13Remove uncontested renamed files during merge.Libravatar Shawn Pearce1-1/+1
2006-12-12merge-recursive: add/add really is modify/modify with an empty baseLibravatar Johannes Schindelin1-29/+15
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 08:56:26 +0000