summaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
* -Wold-style-definition fixJunio C Hamano2007-06-131-1/+1
* merge-recursive: refuse to merge binary filesJohannes Schindelin2007-06-041-0/+6
* Ignore merged status of the file-level mergeAlex Riesen2007-04-261-1/+1
* Add a test for merging changed and rename-changed branchesAlex Riesen2007-04-251-0/+5
* Avoid excessive rewrites in merge-recursiveAlex Riesen2007-04-251-13/+19
* Merge branch 'jc/attr'Junio C Hamano2007-04-211-21/+382
|\
| * Fix bogus linked-list management for user defined merge drivers.Junio C Hamano2007-04-211-1/+2
| * Simplify code to find recursive merge driver.Junio C Hamano2007-04-181-7/+2
| * Counto-fix in merge-recursiveJunio C Hamano2007-04-181-1/+4
| * Fix funny types used in attribute value representationJunio C Hamano2007-04-181-7/+10
| * Allow low-level driver to specify different behaviour during internal merge.Junio C Hamano2007-04-181-0/+12
| * Custom low-level merge driver: change the configuration scheme.Junio C Hamano2007-04-181-77/+125
| * Allow the default low-level merge driver to be configured.Junio C Hamano2007-04-181-2/+12
| * Custom low-level merge driver support.Junio C Hamano2007-04-181-12/+165
| * Allow specifying specialized merge-backend per path.Junio C Hamano2007-04-171-7/+129
| * merge-recursive: separate out xdl_merge() interface.Junio C Hamano2007-04-171-21/+35
* | Kill the useless progress meter in merge-recursiveShawn O. Pearce2007-04-201-62/+3
* | Fix working directory errno handling when unlinking a directoryLinus Torvalds2007-04-191-25/+29
* | merge-recursive: handle D/F conflict case more carefully.Junio C Hamano2007-04-101-3/+26
* | merge-recursive: do not barf on "to be removed" entries.Junio C Hamano2007-04-101-5/+11
|/
* A new merge stragety 'subtree'.Junio C Hamano2007-04-071-0/+29
* Merge branch 'jc/index-output'Junio C Hamano2007-04-071-2/+2
|\
| * _GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.Junio C Hamano2007-04-031-2/+2
* | Fix bogus error message from merge-recursive error pathJunio C Hamano2007-04-051-1/+1
|/
* Keep rename/rename conflicts of intermediate merges while doing recursive mergeAlex Riesen2007-03-311-6/+31
* 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
| |\
View Lorry Controller Status