Bryan Alves <bryanalves@xxxxxxxxx> writes: > Documentation/merge-options.txt | 4 +++- > builtin-merge.c | 3 +++ This needs tests to make sure that existing programs that internally use "git merge" (e.g. "rebase -m", "rebase -i") do not break when the end user has this configuration set in the repository, in addition to that "merge" works as expected with and without this configuration variable, with combinations with the use of relevant command line options. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html