summaryrefslogtreecommitdiffstats
path: root/merge-ort-wrappers.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* merge: fix leaking merge basesPatrick Steinhardt2024-06-111-1/+1
* cache.h: remove this no-longer-used headerElijah Newren2023-06-211-1/+1
* read-cache*.h: move declarations for read-cache.c functions from cache.hElijah Newren2023-06-211-0/+1
* commit.h: reduce unnecessary includesElijah Newren2023-04-241-0/+1
* hash-ll.h: split out of hash.h to remove dependency on repository.hElijah Newren2023-04-241-0/+1
* treewide: be explicit about dependence on gettext.hElijah Newren2023-03-211-0/+1
* merge-ort-wrappers: make printed message match the one from recursiveElijah Newren2022-07-231-2/+2
* merge(s): apply consistent punctuation to "up to date" messagesEric Sunshine2021-05-031-1/+1
* merge-ort-wrappers: new convience wrappers to mimic the old merge APIElijah Newren2020-10-271-0/+62