diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-18 21:32:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-18 21:32:53 (GMT) |
| commit | a1f95951efc55c97477e32287b06e204553be5c2 (patch) | |
| tree | 65bda8319dd00e2e2bab2a2a4d77ca1e8f41944a /help.c | |
| parent | 7660da161821ab79b8ecd5019c28843ed7e770a6 (diff) | |
| parent | 14c4586c2dfa94d86d71a60481dd20bc5b56e562 (diff) | |
| download | git-a1f95951efc55c97477e32287b06e204553be5c2.zip git-a1f95951efc55c97477e32287b06e204553be5c2.tar.gz git-a1f95951efc55c97477e32287b06e204553be5c2.tar.bz2 | |
Merge branch 'en/merge-ort-api-null-impl'
Preparation for a new merge strategy.
* en/merge-ort-api-null-impl:
merge,rebase,revert: select ort or recursive by config or environment
fast-rebase: demonstrate merge-ort's API via new test-tool command
merge-ort-wrappers: new convience wrappers to mimic the old merge API
merge-ort: barebones API of new merge strategy with empty implementation
Diffstat (limited to 'help.c')
0 files changed, 0 insertions, 0 deletions