[PATCH v4 0/4] Updated patch series for default upstream merge

[Jared Hance <jaredhance@gmail.com>]

This patch series allows for `git merge` to default to the upstream of the
current branch.

This update adds fixes based on all of the style-feedback from the previous
patch series; functionally it is equivalent (except for the first patch).

Should I have put the patch submitted by Jonathan Nieder in this series? I
didn't place it in the tree but it should apply on top if it.

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