From: Jared Hance <jaredhance@gmail.com>
To: git@vger.kernel.org
Cc: Jared Hance <jaredhance@gmail.com>
Subject: [PATCH v4 0/4] Updated patch series for default upstream merge
Date: Thu, 10 Feb 2011 18:40:00 -0500 [thread overview]
Message-ID: <1297381209-6377-1-git-send-email-jaredhance@gmail.com> (raw)
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
next reply other threads:[~2011-02-10 23:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-10 23:40 Jared Hance [this message]
2011-02-10 23:40 ` [PATCH v4 1/4] merge: update the usage information to be more modern Jared Hance
2011-02-10 23:40 ` [PATCH v4 1/5] t5526: Fix wrong argument order in "git config" Jared Hance
2011-02-10 23:40 ` [PATCH v4 2/4] merge: introduce setup_merge_commit helper function Jared Hance
2011-02-10 23:40 ` [PATCH v4 2/5] merge: update the usage information to be more modern Jared Hance
2011-02-10 23:40 ` [PATCH v4 3/4] merge: introduce per-branch-configuration helper function Jared Hance
2011-02-10 23:40 ` [PATCH v4 3/5] merge: introduce setup_merge_commit " Jared Hance
2011-02-10 23:40 ` [PATCH v4 4/4] merge: add support for merging from upstream by default Jared Hance
2011-02-11 7:37 ` Bert Wesarg
2011-02-10 23:40 ` [PATCH v4 4/5] merge: introduce per-branch-configuration helper function Jared Hance
2011-02-10 23:40 ` [PATCH v4 5/5] merge: add support for merging from upstream by default Jared Hance
2011-02-10 23:47 ` [PATCH v4 0/4] Updated patch series for default upstream merge Jared Hance
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1297381209-6377-1-git-send-email-jaredhance@gmail.com \
--to=jaredhance@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).