From: "Björn Steinbrink" <B.Steinbrink@gmx.de>
To: Jakub Narebski <jnareb@gmail.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
git@vger.kernel.org, Thomas Rast <trast@student.ethz.ch>
Subject: Re: Heads up: major rebase -i -p rework coming up
Date: Sun, 25 Jan 2009 18:18:21 +0100 [thread overview]
Message-ID: <20090125171821.GA5881@atjola.homenet> (raw)
In-Reply-To: <200901251722.53392.jnareb@gmail.com>
On 2009.01.25 17:22:52 +0100, Jakub Narebski wrote:
> Or perhaps:
>
> merge A' D' into B Merge bla/blub
That would be confusing. I'd read it as:
git checkout B
git merge A' D'
But the point of B is just to tell rebase that the original merge commit
B is replaced by this new merge commit, so that B' works later.
Björn
next prev parent reply other threads:[~2009-01-25 17:20 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-24 20:25 Heads up: major rebase -i -p rework coming up Johannes Schindelin
2009-01-24 20:37 ` Junio C Hamano
2009-01-24 21:04 ` Johannes Schindelin
2009-01-24 21:09 ` Johannes Schindelin
2009-01-24 23:01 ` Junio C Hamano
2009-01-25 2:23 ` Johannes Schindelin
2009-01-26 16:21 ` Marc Branchaud
2009-01-24 22:47 ` Thomas Rast
2009-01-25 2:05 ` Johannes Schindelin
2009-01-25 2:25 ` Johannes Schindelin
2009-01-25 13:46 ` Jakub Narebski
2009-01-25 14:17 ` Johannes Schindelin
2009-01-25 15:07 ` Sverre Rabbelier
2009-01-25 15:24 ` Johannes Schindelin
2009-01-25 20:35 ` Junio C Hamano
2009-01-25 20:59 ` Johannes Schindelin
2009-01-25 22:03 ` Jakub Narebski
2009-01-25 23:29 ` Johannes Schindelin
2009-02-03 10:05 ` Nanako Shiraishi
2009-02-03 11:47 ` Johannes Schindelin
2009-01-25 16:22 ` Jakub Narebski
2009-01-25 17:18 ` Björn Steinbrink [this message]
2009-01-26 16:10 ` Marc Branchaud
2009-01-27 15:21 ` Stephen Haberman
2009-01-27 18:08 ` Johannes Schindelin
2009-01-27 22:10 ` Nanako Shiraishi
2009-01-27 22:36 ` Stephen Haberman
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=20090125171821.GA5881@atjola.homenet \
--to=b.steinbrink@gmx.de \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.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