Elijah Newren wrote:
On Thu, Mar 12, 2020 at 10:55 AM Jonathan Nieder [off-list ref] wrote:
quoted
What if we support multiple merge.backend values, with semantics:
- last recognized value wins
- if no value is specified, use the default
- if values are specified but none are recognized, error out with a
clear error message
?
Sure, but...isn't that what we already do, other than maybe the
'clear' part of step 3?
Sorry for the lack of clarity. I mean allowing
[rebase]
backend = am
backend = apply
backend = futuristic
with behavior
- on "git" that understands am but not apply or futuristic, use the am
backend
- on "git" that understands apply but not am or futuristic, use the
apply backend
- on "git" that understands apply and futuristic, use the futuristic
backend
That way, a single config file is usable on all three versions of Git.
Thanks,
Jonathan