This patch series allows merge, when given proper configuration, to default to the upstream of the current branch. The last one I sent was malformed due to two versions of the patch series being in the tree at once; this is fixed and has some minor changes from v4. Jared Hance (4): merge: update the usage information to be more modern merge: introduce setup_merge_commit helper function merge: introduce per-branch-configuration helper function merge: add support for merging from upstream by default Documentation/config.txt | 6 +++ builtin/merge.c | 90 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 69 insertions(+), 27 deletions(-) -- 1.7.4 -- 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