aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/merge-recursive.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2025-08-08builtin: also setup gently for --help-allD. Ben Knoble1-1/+2
2025-04-08builtin/merge-recursive: switch to using merge_ort_generic()Elijah Newren1-2/+2
2025-01-17builtin: send usage() help text to standard outputJunio C Hamano1-0/+6
2024-09-13builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.hJohn Cai1-1/+1
2024-09-13builtin: add a repository parameter for builtin functionsJohn Cai1-1/+4
2024-07-13merge-recursive: honor diff.algorithmAntonin Delpeuch1-1/+1
2024-06-11builtin/merge-recursive: fix leaking object ID basesPatrick Steinhardt1-4/+2
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-3/+0
2023-06-21cache.h: remove this no-longer-used headerElijah Newren1-1/+0
2023-05-09Merge branch 'en/header-split-cache-h-part-2'Junio C Hamano1-0/+2
2023-04-25Merge branch 'en/header-split-cache-h'Junio C Hamano1-0/+2
2023-04-24hash-ll.h: split out of hash.h to remove dependency on repository.hElijah Newren1-0/+2
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren1-0/+1
2023-04-11treewide: be explicit about dependence on advice.hElijah Newren1-0/+1
2023-04-06Merge branch 'en/header-split-cleanup'Junio C Hamano1-0/+1
2023-04-06Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano1-3/+3
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano1-3/+3
2023-03-28builtins: mark unused prefix parametersJeff King1-1/+1
2023-03-28cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-3/+3
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren1-0/+1
2022-03-07gettext API users: don't explicitly cast ngettext()'s "n"Ævar Arnfjörð Bjarmason1-1/+1
2019-08-19Ensure index matches head before invoking merge machinery, round NElijah Newren1-0/+4
2019-02-06Merge branch 'nd/the-index-final'Junio C Hamano1-1/+1
2019-01-14merge-recursive.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-1/+1
2019-01-11merge-recursive: copy $GITHEAD stringsJeff King1-5/+10
2018-07-16builtin/merge-recursive: make hash independentbrian m. carlson1-2/+2
2016-09-15i18n: merge-recursive: mark verbose message for translationVasco Almeida1-1/+1
2016-09-15i18n: merge-recursive: mark error messages for translationVasco Almeida1-7/+10
2016-06-28merge-recursive: convert merge_recursive_generic() to object_idbrian m. carlson1-10/+10
2015-09-25convert trivial sprintf / strcpy calls to xsnprintfJeff King1-1/+1
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder1-2/+2
2011-03-22Fix sparse warningsStephen Boyd1-1/+1
2010-10-26Merge branch 'jf/merge-ignore-ws'Junio C Hamano1-13/+2
2010-09-03Merge branch 'jn/merge-renormalize'Junio C Hamano1-0/+4
2010-09-03builtin/merge_recursive.c: Add an usage string and make use of it.Thiago Farina1-1/+4
2010-08-26merge-recursive --patienceJustin Frankel1-0/+1
2010-08-26merge-recursive: expose merge options for builtin mergeJonathan Nieder1-13/+1
2010-08-06merge-recursive --renormalizeJonathan Nieder1-0/+4
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds1-0/+84
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-11 22:26:33 +0000