From: "Holger Hellmuth (IKS)" <hellmuth@ira.uka.de>
To: Josef Wolf <jw@raven.inka.de>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Workflow for templates?
Date: Wed, 07 Nov 2012 17:03:07 +0100 [thread overview]
Message-ID: <509A863B.4090805@ira.uka.de> (raw)
In-Reply-To: <20121106210719.GG28437@raven.wolf.lan>
Am 06.11.2012 22:07, schrieb Josef Wolf:
> On Tue, Nov 06, 2012 at 08:21:25PM +0000, Pyeron, Jason J CTR (US) wrote:
>> Maybe I lost sight of your problem. Can you give a specific example of where "it" does not work?
>
> I guess it's _me_ who's lost. I can't figure how this is supposed to
> work. Maybe you have an example?
Let me ask a different question: What is wrong with cherry-picking
downstream changes to your upstream branch? Without rebasing it to
downstream.
That might mean there is a rather useless merge downstream later on, but
that's the price you pay for not doing the change in a development branch.
next prev parent reply other threads:[~2012-11-07 15:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-25 21:15 Workflow for templates? Josef Wolf
2012-10-27 18:45 ` Enrico Weigelt
2012-10-31 10:44 ` Josef Wolf
2012-11-06 19:50 ` Josef Wolf
2012-11-06 20:21 ` Pyeron, Jason J CTR (US)
2012-11-06 21:07 ` Josef Wolf
2012-11-07 16:03 ` Holger Hellmuth (IKS) [this message]
2012-11-10 7:27 ` Enrico Weigelt
2012-11-10 7:13 ` Enrico Weigelt
2012-11-10 9:56 ` Philip Oakley
2012-11-10 10:29 ` Enrico Weigelt
2012-11-10 13:44 ` Philip Oakley
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=509A863B.4090805@ira.uka.de \
--to=hellmuth@ira.uka.de \
--cc=git@vger.kernel.org \
--cc=jw@raven.inka.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.