I don't see why people need to set these to have sensible behavior: merge.defaulttoupstream = true mergetool.prompt = false
Let's change them to sane defaults so they are not needed. Felipe Contreras (2): merge: enable defaulttoupstream by default mergetool: run prompt only if guessed tool Documentation/git-merge.txt | 5 ++--- builtin/merge.c | 2 +- git-mergetool.sh | 14 +++++++++++--- 3 files changed, 14 insertions(+), 7 deletions(-) -- 1.9.2+fc1.1.g5c924db -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
