All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michael J Gruber <git@drmicha.warpmail.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Stephan Beyer <s-beyer@gmx.net>,
	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 17:56:35 +0100	[thread overview]
Message-ID: <496F6AC3.7050704@drmicha.warpmail.net> (raw)
In-Reply-To: <alpine.DEB.1.00.0901151658060.3586@pacific.mpi-cbg.de>

Johannes Schindelin venit, vidit, dixit 15.01.2009 17:04:
...
>>> The more I think about it, I think it's possible I broke it with the 
>>> introduction of the "noop".
>> It certainly worked after the noop introduction before the r-i-p series, 
>> but not any more after.
> 
> Umm... which rebase -i -p series do you mean?  "noop" was introduced 
> pretty recently if my Alzheimered brain does not fool me.

This one introduced noop:

commit ff74126c03a8dfd04e7533573a5c420f2a7112ac
Author: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date:   Fri Oct 10 13:42:12 2008 +0200

    rebase -i: do not fail when there is no commit to cherry-pick

This is the bad one from bisect:

commit d80d6bc146232d81f1bb4bc58e5d89263fd228d4
Author: Stephen Haberman <stephen@exigencecorp.com>
Date:   Wed Oct 15 02:44:39 2008 -0500

    rebase-i-p: do not include non-first-parent commits touching UPSTREAM

It's the last one in a longer series. And that series is after the noop
introduction.

Michael

  parent reply	other threads:[~2009-01-15 16:58 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 [this message]
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=496F6AC3.7050704@drmicha.warpmail.net \
    --to=git@drmicha.warpmail.net \
    --cc=Johannes.Schindelin@gmx.de \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.