From: Petr Baudis <pasky@suse.cz>
To: martin f krafft <madduck@madduck.net>
Cc: git@vger.kernel.org
Subject: Re: TopGit: how to deal with upstream inclusion
Date: Sun, 21 Sep 2008 16:19:24 +0200 [thread overview]
Message-ID: <20080921141924.GI10360@machine.or.cz> (raw)
In-Reply-To: <20080919170406.GA22849@lapse.rw.madduck.net>
On Fri, Sep 19, 2008 at 06:04:06PM +0100, martin f krafft wrote:
> also sprach Petr Baudis <pasky@suse.cz> [2008.09.14.2203 +0100]:
> > (iii) Merge in RETIRED head branch with -s ours
>
> Yes, it does. One might want to consider to make the use of -s ours
> in (iiii) configurable, but otherwise that's it.
That might be pretty dangerous, since then your topic branch will have
outstanding branches of the retired branch, but they will _NOT_ be
visible to tg patch and others since they will be in both the base and
head.
--
Petr "Pasky" Baudis
The next generation of interesting software will be done
on the Macintosh, not the IBM PC. -- Bill Gates
next prev parent reply other threads:[~2008-09-21 14:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-14 20:30 TopGit: how to deal with upstream inclusion martin f krafft
2008-09-14 21:03 ` Petr Baudis
2008-09-19 17:04 ` martin f krafft
2008-09-21 14:19 ` Petr Baudis [this message]
2008-09-23 6:35 ` martin f krafft
2008-09-23 9:55 ` Petr Baudis
2008-09-24 11:21 ` martin f krafft
2008-09-24 15:29 ` Petr Baudis
2008-09-24 18:13 ` martin f krafft
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=20080921141924.GI10360@machine.or.cz \
--to=pasky@suse.cz \
--cc=git@vger.kernel.org \
--cc=madduck@madduck.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;
as well as URLs for NNTP newsgroup(s).