From: Stephen Haberman <stephen@exigencecorp.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org, Michael J Gruber <git@drmicha.warpmail.net>,
Stephan Beyer <s-beyer@gmx.net>,
Sitaram Chamarty <sitaramc@gmail.com>
Subject: Re: [PATCH] rebase -p: seed first commit in case it's before the merge bases.
Date: Sat, 17 Jan 2009 22:02:26 -0600 [thread overview]
Message-ID: <20090117220226.8f0d1960.stephen@exigencecorp.com> (raw)
In-Reply-To: <20090117215751.60ade90a.stephen@exigencecorp.com>
> Perhaps it is not "good", but the explanation a blank REWRITTEN/sha1 is
> used a marker during the probe phase that this commit will be rewritten.
> So when looking at any of its children commits, they should be rewritten
> if a REWRITTEN/parentSha1 exists.
Ugh, fixing several typos:
Perhaps it is not "good", but the explanation /is that/ a blank
REWRITTEN/sha1 is used /as/ a marker during the probe phase that this
commit will be rewritten. So when looking at any of its children
commits, /the children/ should be rewritten if a REWRITTEN/parentSha1
exists.
Sorry about that.
- Stephen
next prev parent reply other threads:[~2009-01-18 4:03 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
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 [this message]
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=20090117220226.8f0d1960.stephen@exigencecorp.com \
--to=stephen@exigencecorp.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=s-beyer@gmx.net \
--cc=sitaramc@gmail.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).