From: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
To: Thomas Rast <trast@student.ethz.ch>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: Branch shuffling after 1.6.6 release plans
Date: Fri, 25 Dec 2009 14:28:49 +0200 [thread overview]
Message-ID: <20091225122848.GA11550@Knoppix> (raw)
In-Reply-To: <200912251230.48243.trast@student.ethz.ch>
On Fri, Dec 25, 2009 at 12:30:34PM +0100, Thomas Rast wrote:
>
> I can try hacking some internal option into the merge helpers, by
> which they declare to be (in)compatible with rebasing. I think this
> what Dscho or Sverre mentioned in the corresponding thread, but I
> forgot about it when I noticed you had already promoted the above to
> 'next'.
If you do that, maybe do all relevant flags (such as "no fast forwards"
and "no trivial merging") at the same time. That would allow external
strategies to use those flags.
-Ilari
next prev parent reply other threads:[~2009-12-25 12:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-24 1:06 [ANNOUNCE] Git 1.6.6 Junio C Hamano
2009-12-24 18:01 ` Some stats for 1.6.6 Junio C Hamano
2009-12-24 19:43 ` Shawn O. Pearce
2009-12-25 0:25 ` Branch shuffling after 1.6.6 release plans Junio C Hamano
2009-12-25 11:30 ` Thomas Rast
2009-12-25 12:28 ` Ilari Liusvaara [this message]
2009-12-26 8:01 ` Jeff King
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=20091225122848.GA11550@Knoppix \
--to=ilari.liusvaara@elisanet.fi \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=trast@student.ethz.ch \
/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).