From: Enrico Weigelt <enrico.weigelt@vnc.biz>
To: Eric Miao <eric.y.miao@gmail.com>
Cc: Michael J Gruber <git@drmicha.warpmail.net>,
git@vger.kernel.org, Jeff King <peff@peff.net>
Subject: Re: Support for a series of patches, i.e. patchset or changeset?
Date: Sat, 10 Nov 2012 09:52:21 +0100 (CET) [thread overview]
Message-ID: <6df0df49-afb9-4faf-9a2d-6f397f3a167a@zcs> (raw)
In-Reply-To: <CAMPhdO8Sy8ZuXyWbvch+fXzbSVdmwC69a-KaLBRBGX8MVGxv_A@mail.gmail.com>
<snip>
yet another idea:
you coud always put your patchsets into separate branches,
rebase them ontop target branch before merging, and then
do an non-ff-merge, which will make the history look like:
* merged origin/feature_foo
|\
| * first preparation fo feature foo
| * part a
| * part b
|/
* merged origin/bugfix_blah
|\
| * fixing bug blah
|/
*
cu
--
Mit freundlichen Grüßen / Kind regards
Enrico Weigelt
VNC - Virtual Network Consult GmbH
Head Of Development
Pariser Platz 4a, D-10117 Berlin
Tel.: +49 (30) 3464615-20
Fax: +49 (30) 3464615-59
enrico.weigelt@vnc.biz; www.vnc.de
next prev parent reply other threads:[~2012-11-10 8:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-05 2:26 Support for a series of patches, i.e. patchset or changeset? Eric Miao
2012-11-05 13:39 ` Michael J Gruber
2012-11-05 14:12 ` Eric Miao
2012-11-05 14:40 ` Michael J Gruber
2012-11-06 0:58 ` Eric Miao
2012-11-06 6:39 ` Johannes Sixt
2012-11-06 6:56 ` Eric Miao
2012-11-06 7:44 ` Johannes Sixt
2012-11-07 1:50 ` Eric Miao
2012-11-08 19:09 ` Jeff King
2012-11-09 2:14 ` Eric Miao
2012-11-10 8:52 ` Enrico Weigelt [this message]
2012-11-10 9:08 ` Eric Miao
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=6df0df49-afb9-4faf-9a2d-6f397f3a167a@zcs \
--to=enrico.weigelt@vnc.biz \
--cc=eric.y.miao@gmail.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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