summaryrefslogtreecommitdiffstats
path: root/merge-recursive.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pc/remove-warn'Junio C Hamano2010-05-091-1/+1
|\
| * Remove a redundant errno test in a usage of remove_pathPeter Collingbourne2010-03-281-1/+1
* | merge-recursive: add a label for ancestorJonathan Nieder2010-03-211-0/+1
* | merge_trees(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-211-3/+8
* | ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder2010-03-211-1/+1
|/
* refactor duplicated fill_mm() in checkout and merge-recursiveMichael Lukashov2010-02-181-20/+3
* Merge branch 'maint'Junio C Hamano2010-01-221-4/+4
|\
| * merge-recursive: do not return NULL only to cause segfaultJunio C Hamano2010-01-221-4/+4
* | Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-211-10/+29
|\ \ | |/ |/|
| * Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano2010-01-181-9/+11
| * git merge -X<option>Avery Pennarun2010-01-181-2/+19
* | Merge branch 'mm/maint-merge-ff-error-message-fix'Junio C Hamano2009-11-301-18/+23
|\ \ | |/ |/|
| * merge-recursive: make the error-message generation an extern functionMatthieu Moy2009-11-301-13/+18
* | Merge branch 'mm/maint-hint-failed-merge'Junio C Hamano2009-11-241-1/+7
|\ \
| * | merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy2009-11-231-1/+7
| |/
* / Check the format of more printf-type functionsTarmigan Casebolt2009-11-161-1/+3
|/
* 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-111-3/+25
|\
| * merge-recursive: don't segfault while handling rename clashesJunio C Hamano2009-07-311-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-021-2/+7
* | | | | Fix various sparse warnings in the git source codeLinus Torvalds2009-06-211-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-101-5/+6
* | | | | merge-recursive: do not die on a conflicting submoduleJunio C Hamano2009-04-301-2/+6
* | | | | Merge branch 'cb/maint-merge-recursive-submodule-fix'Junio C Hamano2009-04-081-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-161-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-251-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-051-1/+2
* | merge-recursive: use strbuf_expand() instead of interpolate()René Scharfe2008-11-241-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-051-27/+30
* | merge-recursive: move the global obuf to struct merge_optionsMiklos Vajna2008-09-051-19/+18
* | merge-recursive: get rid of the index_only global variableMiklos Vajna2008-09-051-73/+67
* | merge-recursive: move call_depth to struct merge_optionsMiklos Vajna2008-09-041-13/+12
* | merge-recursive: introduce merge_optionsMiklos Vajna2008-08-311-132/+133
* | merge-recursive.c: Add more generic merge_recursive_generic()Stephan Beyer2008-08-311-0/+53
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 15:28:08 +0100