summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
AgeCommit message (Expand)AuthorFilesLines
2022-03-07gettext API users: don't explicitly cast ngettext()'s "n"Libravatar Ævar Arnfjörð Bjarmason1-1/+1
2019-08-19Ensure index matches head before invoking merge machinery, round NLibravatar Elijah Newren1-0/+4
2019-02-06Merge branch 'nd/the-index-final'Libravatar Junio C Hamano1-1/+1
2019-01-14merge-recursive.c: remove implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2019-01-11merge-recursive: copy $GITHEAD stringsLibravatar Jeff King1-5/+10
2018-07-16builtin/merge-recursive: make hash independentLibravatar brian m. carlson1-2/+2
2016-09-15i18n: merge-recursive: mark verbose message for translationLibravatar Vasco Almeida1-1/+1
2016-09-15i18n: merge-recursive: mark error messages for translationLibravatar Vasco Almeida1-7/+10
2016-06-28merge-recursive: convert merge_recursive_generic() to object_idLibravatar brian m. carlson1-10/+10
2015-09-25convert trivial sprintf / strcpy calls to xsnprintfLibravatar Jeff King1-1/+1
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Libravatar Christian Couder1-2/+2
2011-03-22Fix sparse warningsLibravatar Stephen Boyd1-1/+1
2010-10-26Merge branch 'jf/merge-ignore-ws'Libravatar Junio C Hamano1-13/+2
2010-09-03Merge branch 'jn/merge-renormalize'Libravatar Junio C Hamano1-0/+4
2010-09-03builtin/merge_recursive.c: Add an usage string and make use of it.Libravatar Thiago Farina1-1/+4
2010-08-26merge-recursive --patienceLibravatar Justin Frankel1-0/+1
2010-08-26merge-recursive: expose merge options for builtin mergeLibravatar Jonathan Nieder1-13/+1
2010-08-06merge-recursive --renormalizeLibravatar Jonathan Nieder1-0/+4
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLibravatar Linus Torvalds1-0/+84
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 06:01:00 +0000