From: Jakub Narebski <jnareb@gmail•com>
To: git@vger•kernel.org
Subject: Re: [RFC] Replace rebase with filtering
Date: Tue, 16 Jan 2007 22:49:45 +0100 [thread overview]
Message-ID: <eojh8r$9e6$1@sea.gmane.org> (raw)
In-Reply-To: Pine.LNX.4.63.0701162218070.22628@wbgn013.biozentrum.uni-wuerzburg.de
Johannes Schindelin wrote:
> Usually, however, this results in a conflict which you have to resolve.
> And _you_ do not have a hard time verifying that the patch already went
> in, and you just say "git rebase --skip" and the rebasing will continue
> _without_ having committed the now obsolete patch.
Unfortunately, at least with git 1.4.4.x, not quite. You have to have
index clean to do "git rebase --skip", while usually there would be
conflict when applying patch that is already present some deeper.
I think that is a bug in git-rebase.
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
next prev parent reply other threads:[~2007-01-16 21:49 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-16 2:41 [RFC] Replace rebase with filtering Steven Grimm
2007-01-16 11:18 ` Johannes Schindelin
2007-01-16 19:20 ` Steven Grimm
2007-01-16 19:43 ` Steven Grimm
2007-01-16 20:35 ` Johannes Schindelin
2007-01-16 20:40 ` Steven Grimm
2007-01-16 21:14 ` Jakub Narebski
2007-01-16 21:22 ` Shawn O. Pearce
2007-01-16 21:23 ` Johannes Schindelin
2007-01-16 21:20 ` Johannes Schindelin
2007-01-16 21:49 ` Jakub Narebski [this message]
2007-01-16 22:31 ` Brian Gernhardt
2007-01-16 22:51 ` Johannes Schindelin
2007-01-16 22:53 ` Junio C Hamano
2007-01-16 22:57 ` Johannes Schindelin
2007-01-17 22:21 ` Steven Grimm
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='eojh8r$9e6$1@sea.gmane.org' \
--to=jnareb@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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