summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
AgeCommit message (Expand)Author
2022-03-07gettext API users: don't explicitly cast ngettext()'s "n"Ævar Arnfjörð Bjarmason
2019-08-19Ensure index matches head before invoking merge machinery, round NElijah Newren
2019-02-07Merge branch 'nd/the-index-final'Junio C Hamano
2019-01-14merge-recursive.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy
2019-01-12merge-recursive: copy $GITHEAD stringsJeff King
2018-07-16builtin/merge-recursive: make hash independentbrian m. carlson
2016-09-15i18n: merge-recursive: mark verbose message for translationVasco Almeida
2016-09-15i18n: merge-recursive: mark error messages for translationVasco Almeida
2016-06-28merge-recursive: convert merge_recursive_generic() to object_idbrian m. carlson
2015-09-25convert trivial sprintf / strcpy calls to xsnprintfJeff King
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder
2011-03-22Fix sparse warningsStephen Boyd
2010-10-27Merge branch 'jf/merge-ignore-ws'Junio C Hamano
2010-09-03Merge branch 'jn/merge-renormalize'Junio C Hamano
2010-09-03builtin/merge_recursive.c: Add an usage string and make use of it.Thiago Farina
2010-08-26merge-recursive --patienceJustin Frankel
2010-08-26merge-recursive: expose merge options for builtin mergeJonathan Nieder
2010-08-06merge-recursive --renormalizeJonathan Nieder
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds