diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-10-27 02:08:08 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-10-26 22:36:14 -0700 |
| commit | 47b1e890e3f7ba57e8c5bc364dcb04d8b2dc1c58 (patch) | |
| tree | cbd7a8765991045d59d0047367b1a23404460512 /http-push.c | |
| parent | merge-ort: barebones API of new merge strategy with empty implementation (diff) | |
| download | tgif-47b1e890e3f7ba57e8c5bc364dcb04d8b2dc1c58.tar.xz | |
merge-ort-wrappers: new convience wrappers to mimic the old merge API
There are a few differences between the new API in merge-ort and the old
API in merge-recursive. While the new API is more flexible, it might
feel like more work at times than the old API. merge-ort-wrappers
creates two convenience wrappers taking the exact same arguments as the
old merge_trees() and merge_recursive() functions and implements them
via the new API. This makes converting existing callsites easier, and
serves to highlight some of the differences in the API.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http-push.c')
0 files changed, 0 insertions, 0 deletions