Commit Graph

6 Commits (338abb0f045b87df5e628543800e74dec0e72cdf)

Author SHA1 Message Date
Ævar Arnfjörð Bjarmason 338abb0f04 builtins + test helpers: use return instead of exit() in cmd_* 1 year ago
Nguyễn Thái Ngọc Duy f8adbec9fe cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch 4 years ago
Nguyễn Thái Ngọc Duy ffc00a48ef diff-lib.c: remove the_repository references 4 years ago
Junio C Hamano a92b1095d1 merge-ours: do not use cmd_*() as a subroutine 5 years ago
Linus Torvalds 81b50f3ce4 Move 'builtin-*' into a 'builtin/' subdirectory 13 years ago
Jonathan Nieder 20c7e3d5cf Show usage string for 'git merge-ours -h' 13 years ago
Thomas Harning a00a42ae33 git-merge-ours: make it a builtin. 15 years ago