aboutsummaryrefslogtreecommitdiff
path: root/builtin/merge-ours.c
AgeCommit message (Expand)Author
2026-02-06merge-ours: integrate with sparse-indexSam Bostock
2026-02-06merge-ours: drop USE_THE_REPOSITORY_VARIABLESam Bostock
2025-01-17builtin: send usage() help text to standard outputJunio C Hamano
2024-12-06diff.h: fix index used to loop through unsigned integerPatrick Steinhardt
2024-12-06global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt
2024-09-13builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.hJohn Cai
2024-09-13builtin: add a repository parameter for builtin functionsJohn Cai
2023-06-21diff.h: remove unnecessary include of oidset.hElijah Newren
2023-03-28builtins: mark unused prefix parametersJeff King
2022-11-21cocci: apply "pending" index-compatibility to some "builtin/*.c"Ævar Arnfjörð Bjarmason
2021-06-09builtins + test helpers: use return instead of exit() in cmd_*Ævar Arnfjörð Bjarmason
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy
2018-11-12diff-lib.c: remove the_repository referencesNguyễn Thái Ngọc Duy
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano
2017-10-11merge-ours: do not use cmd_*() as a subroutineJunio C Hamano
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds