From: Michael J Gruber <git@drmicha.warpmail.net>
To: Stephan Beyer <s-beyer@gmx.net>
Cc: Sitaram Chamarty <sitaramc@gmail.com>,
git@vger.kernel.org, Stephen Haberman <stephen@exigencecorp.com>
Subject: Re: rebase -p confusion in 1.6.1
Date: Thu, 15 Jan 2009 15:14:04 +0100 [thread overview]
Message-ID: <496F44AC.2060607@drmicha.warpmail.net> (raw)
In-Reply-To: <20090115135518.GB10045@leksak.fem-net>
Stephan Beyer venit, vidit, dixit 15.01.2009 14:55:
> Hi,
>
>> First of all: git 1.6.0.6 gives you the unchanged graph after using
>> rebase -i -p.
>
> This is true and it is a far better behavior than now, but I think it's
> not the expected behavior. (I have written about the behavior I'd expect
> in another reply to the original mail.)
Yep, I think -p should preserve only merges in side branches (and
therefore produce what you suggest, and what you get without -p). If it
preserves all merges then there is nothing to rewrite here.
BTW: How does the sequencer based rebase do in this case, and what's the
general status? If it's about to be integrated we can do without the
present script...
Michael
next prev parent reply other threads:[~2009-01-15 14:15 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-15 10:39 rebase -p confusion in 1.6.1 Sitaram Chamarty
2009-01-15 13:34 ` Johannes Schindelin
2009-01-15 14:51 ` Sitaram Chamarty
2009-01-15 15:09 ` Stephan Beyer
2009-01-15 15:21 ` Sitaram Chamarty
2009-01-15 13:38 ` Stephan Beyer
2009-01-15 13:58 ` Johannes Schindelin
2009-01-15 15:03 ` Sitaram Chamarty
2009-01-15 13:39 ` Michael J Gruber
2009-01-15 13:55 ` Stephan Beyer
2009-01-15 14:14 ` Michael J Gruber [this message]
2009-01-15 14:25 ` Johannes Schindelin
2009-01-15 14:45 ` Michael J Gruber
2009-01-15 16:04 ` Johannes Schindelin
2009-01-15 16:24 ` Sitaram Chamarty
2009-01-15 16:53 ` Johannes Schindelin
2009-01-15 18:22 ` Sitaram Chamarty
2009-01-15 16:56 ` Michael J Gruber
2009-01-15 18:18 ` Johannes Schindelin
[not found] ` <cover.1232233454.git.stephen@exigencecorp.com>
2009-01-17 23:41 ` [PATCH] do not drop commits before the merge base Johannes Schindelin
[not found] ` <ac1a4533de095f916dd68029793c8ee6eb02d200.1232233454.git.stephen@exigencecorp.com>
[not found] ` <a524993b13ee586cf0e8fbd3b6459ccd6767c6d8.1232233454.git.stephen@exigencecorp.com>
2009-01-17 23:51 ` [PATCH] rebase -p: seed first commit in case it's before the merge bases Johannes Schindelin
2009-01-18 0:11 ` Stephen Haberman
2009-01-18 0:19 ` Johannes Schindelin
2009-01-18 3:57 ` Stephen Haberman
2009-01-18 4:02 ` Stephen Haberman
2009-01-15 14:40 ` rebase -p confusion in 1.6.1 Stephan Beyer
2009-01-15 16:43 ` Johannes Schindelin
2009-01-15 15:14 ` Sitaram Chamarty
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=496F44AC.2060607@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=s-beyer@gmx.net \
--cc=sitaramc@gmail.com \
--cc=stephen@exigencecorp.com \
/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).