summaryrefslogtreecommitdiff
path: root/merge-recursive.c
AgeCommit message (Expand)Author
2010-06-27string_list: Fix argument order for string_list_lookupJulian Phillips
2010-06-27string_list: Fix argument order for string_list_insertJulian Phillips
2010-05-09Merge branch 'pc/remove-warn'Junio C Hamano
2010-03-28Remove a redundant errno test in a usage of remove_pathPeter Collingbourne
2010-03-21merge-recursive: add a label for ancestorJonathan Nieder
2010-03-21merge_trees(): add ancestor label parameter for diff3-style outputJonathan Nieder
2010-03-21ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder
2010-02-17refactor duplicated fill_mm() in checkout and merge-recursiveMichael Lukashov
2010-01-22Merge branch 'maint'Junio C Hamano
2010-01-22merge-recursive: do not return NULL only to cause segfaultJunio C Hamano
2010-01-21Merge branch 'ap/merge-backend-opts'Junio C Hamano
2010-01-18Make "subtree" part more orthogonal to the rest of merge-recursive.Junio C Hamano
2010-01-18git merge -X<option>Avery Pennarun
2009-11-30Merge branch 'mm/maint-merge-ff-error-message-fix'Junio C Hamano
2009-11-30merge-recursive: make the error-message generation an extern functionMatthieu Moy
2009-11-24Merge branch 'mm/maint-hint-failed-merge'Junio C Hamano
2009-11-23merge-recursive: point the user to commit when file would be overwritten.Matthieu Moy
2009-11-16Check the format of more printf-type functionsTarmigan Casebolt
2009-09-08merge-recursive: give less scary messages when merge did not startJunio C Hamano
2009-08-11Merge branch 'jc/maint-merge-recursive-fix'Junio C Hamano
2009-07-31merge-recursive: don't segfault while handling rename clashesJunio C Hamano
2009-07-06Merge branch 'tr/die_errno'Junio C Hamano
2009-07-02Remove filename from conflict markersMartin Renold
2009-06-27Convert existing die(..., strerror(errno)) to die_errno()Thomas Rast
2009-06-21Fix various sparse warnings in the git source codeLinus Torvalds
2009-05-23Merge branch 'do/maint-merge-recursive-fix'Junio C Hamano
2009-05-10merge-recursive: never leave index unmerged while recursingDave Olszewski
2009-04-29merge-recursive: do not die on a conflicting submoduleJunio C Hamano
2009-04-08Merge branch 'cb/maint-merge-recursive-submodule-fix'Junio C Hamano
2009-04-05simplify output of conflicting mergeClemens Buchacher
2009-04-05update cache for conflicting submodule entriesClemens Buchacher
2009-03-16Fix various dead stores found by the clang static analyzerBenjamin Kramer
2009-02-07tree.c: allow read_tree_recursive() to traverse gitlink entriesLars Hjemli
2009-01-13Merge branch 'js/maint-merge-recursive-r-d-conflict' into maintJunio C Hamano
2009-01-13Merge branch 'cb/maint-merge-recursive-fix' into maintJunio C Hamano
2009-01-07Merge branch 'js/maint-merge-recursive-r-d-conflict'Junio C Hamano
2008-12-25merge-recursive: mark rename/delete conflict as unmergedJohannes Schindelin
2008-12-15Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fixJunio C Hamano
2008-12-05Report symlink failures in merge-recursiveAlex Riesen
2008-11-24merge-recursive: use strbuf_expand() instead of interpolate()René Scharfe
2008-10-19git-merge-recursive: honor merge.conflictstyle once againMatt McCutchen
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey
2008-09-29Merge branch 'bc/master-diff-hunk-header-fix'Shawn O. Pearce
2008-09-26Merge branch 'maint'Shawn O. Pearce
2008-09-26Cleanup remove_pathAlex Riesen
2008-09-05merge-recursive: get rid of virtual_idMiklos Vajna
2008-09-05merge-recursive: move current_{file,directory}_set to struct merge_optionsMiklos Vajna
2008-09-05merge-recursive: move the global obuf to struct merge_optionsMiklos Vajna
2008-09-05merge-recursive: get rid of the index_only global variableMiklos Vajna
2008-09-04merge-recursive: move call_depth to struct merge_optionsMiklos Vajna