summaryrefslogtreecommitdiff
path: root/merge-recursive.c
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive: give less scary messages when merge did not startJunio C Hamano2009-09-081-4/+21
* Merge branch 'jc/maint-merge-recursive-fix'Junio C Hamano2009-08-101-3/+25
|\
| * merge-recursive: don't segfault while handling rename clashesJunio C Hamano2009-07-301-3/+25
| * Merge branch 'js/maint-merge-recursive-r-d-conflict' into maintJunio C Hamano2009-01-131-0/+5
| |\
| * \ Merge branch 'cb/maint-merge-recursive-fix' into maintJunio C Hamano2009-01-131-0/+32
| |\ \
* | \ \ Merge branch 'tr/die_errno'Junio C Hamano2009-07-061-3/+3
|\ \ \ \
| * | | | Convert existing die(..., strerror(errno)) to die_errno()Thomas Rast2009-06-271-3/+3
* | | | | Remove filename from conflict markersMartin Renold2009-07-011-2/+7
* | | | | Fix various sparse warnings in the git source codeLinus Torvalds2009-06-201-1/+1
|/ / / /
* | | | Merge branch 'do/maint-merge-recursive-fix'Junio C Hamano2009-05-231-5/+6
|\ \ \ \
| * | | | merge-recursive: never leave index unmerged while recursingDave Olszewski2009-05-091-5/+6
* | | | | merge-recursive: do not die on a conflicting submoduleJunio C Hamano2009-04-291-2/+6
* | | | | Merge branch 'cb/maint-merge-recursive-submodule-fix'Junio C Hamano2009-04-071-12/+4
|\ \ \ \ \ | |/ / / /
| * | | | simplify output of conflicting mergeClemens Buchacher2009-04-051-13/+4
| * | | | update cache for conflicting submodule entriesClemens Buchacher2009-04-051-2/+3
* | | | | Fix various dead stores found by the clang static analyzerBenjamin Kramer2009-03-151-8/+3
|/ / / /
* | | | tree.c: allow read_tree_recursive() to traverse gitlink entriesLars Hjemli2009-02-071-1/+1
* | | | Merge branch 'js/maint-merge-recursive-r-d-conflict'Junio C Hamano2009-01-071-0/+5
|\ \ \ \ | | |_|/ | |/| |
| * | | merge-recursive: mark rename/delete conflict as unmergedJohannes Schindelin2008-12-241-0/+5
| |/ /
* | | Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fixJunio C Hamano2008-12-151-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
|/
View Lorry Controller Status