aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/merge-ours.c
AgeCommit message (Expand)AuthorFilesLines
2023-06-21diff.h: remove unnecessary include of oidset.hElijah Newren1-0/+1
2023-03-28builtins: mark unused prefix parametersJeff King1-1/+1
2022-11-21cocci: apply "pending" index-compatibility to some "builtin/*.c"Ævar Arnfjörð Bjarmason1-2/+1
2021-06-09builtins + test helpers: use return instead of exit() in cmd_*Ævar Arnfjörð Bjarmason1-2/+2
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy1-0/+1
2018-11-12diff-lib.c: remove the_repository referencesNguyễn Thái Ngọc Duy1-1/+1
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano1-1/+1
2017-10-11merge-ours: do not use cmd_*() as a subroutineJunio C Hamano1-9/+7
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds1-0/+34