summaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/maint-merge-recursive-r-d-conflict' into maintJunio C Hamano2009-01-131-0/+5
|\
| * merge-recursive: mark rename/delete conflict as unmergedJohannes Schindelin2008-12-241-0/+5
* | Merge branch 'cb/maint-merge-recursive-fix' into maintJunio C Hamano2009-01-131-0/+32
|\ \ | |/ |/|
* | Report symlink failures in merge-recursiveAlex Riesen2008-12-041-1/+2
* | merge-recursive: use strbuf_expand() instead of interpolate()René Scharfe2008-11-231-1/+0
* | git-merge-recursive: honor merge.conflictstyle once againMatt McCutchen2008-10-191-1/+1
* | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey2008-10-121-2/+1
* | Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce2008-09-291-16/+1
|\ \ | |/
* | Merge branch 'maint'Shawn O. Pearce2008-09-261-3/+1
|\ \ | |/
* | Cleanup remove_pathAlex Riesen2008-09-261-5/+3
* | merge-recursive: get rid of virtual_idMiklos Vajna2008-09-051-5/+1
* | merge-recursive: move current_{file,directory}_set to struct merge_optionsMiklos Vajna2008-09-041-27/+30
* | merge-recursive: move the global obuf to struct merge_optionsMiklos Vajna2008-09-041-19/+18
* | merge-recursive: get rid of the index_only global variableMiklos Vajna2008-09-041-73/+67
* | merge-recursive: move call_depth to struct merge_optionsMiklos Vajna2008-09-031-13/+12
* | merge-recursive: introduce merge_optionsMiklos Vajna2008-08-301-132/+133
* | merge-recursive.c: Add more generic merge_recursive_generic()Stephan Beyer2008-08-301-0/+53
* | Split out merge_recursive() to merge-recursive.cMiklos Vajna2008-08-301-0/+1331
|/
* Build-in merge-recursiveDaniel Barkalow2008-02-091-1760/+0
* Make on-disk index representation separate from in-core oneLinus Torvalds2008-01-211-1/+1
* Improve use of lockfile APIBrandon Casey2008-01-161-1/+1
* Fix grammar nits in documentation and in code comments.Jim Meyering2008-01-031-1/+1
* Improved submodule merge supportFinn Arne Gangstad2007-12-191-1/+8
* Support a merge with conflicting gitlink changeJunio C Hamano2007-12-111-4/+6
* Make the diff_options bitfields be an unsigned with explicit masks.Pierre Habouzit2007-11-111-1/+1
* Merge branch 'maint'Junio C Hamano2007-10-291-1/+1
|\
| * merge-recursive.c: mrtree in merge() is not used before setJunio C Hamano2007-10-291-1/+1
| * Move make_cache_entry() from merge-recursive.c into read-cache.cCarlos Rica2007-09-261-24/+0
* | Merge branch 'ph/strbuf'Junio C Hamano2007-10-031-55/+39
|\ \
| * | nfv?asprintf are broken without va_copy, workaround them.Pierre Habouzit2007-09-201-40/+35
| * | Use xmemdupz() in many places.Pierre Habouzit2007-09-181-15/+4
* | | Make merge-recursive honor diff.renamelimitLars Hjemli2007-09-251-0/+6
|/ /
* | Move make_cache_entry() from merge-recursive.c into read-cache.cCarlos Rica2007-09-121-24/+0
|/
* Use xmkstemp() instead of mkstemp()Luiz Fernando N. Capitulino2007-08-141-3/+1
* merge-recursive: do not rudely die on binary mergeJunio C Hamano2007-08-141-23/+28
* Start moving unpack-trees to "struct tree_desc"Linus Torvalds2007-08-101-5/+11
* -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
View Lorry Controller Status