From: "Uwe Kleine-König" <Uwe.Kleine-Koenig@digi.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: another git rebase -i problem
Date: Fri, 15 Feb 2008 09:10:46 +0100 [thread overview]
Message-ID: <20080215081046.GA12091@digi.com> (raw)
In-Reply-To: <alpine.LSU.1.00.0802141537000.30505@racer.site>
Hallo Johannes,
> Anyway, your "problem" is that you have to say "git rebase --skip",
> because the patch has been applied to upstream already (but looked
> differently enough that the patch id was different).
I just noticed that non-interactive rebase fails in that case, too.
In my eyes
VISUAL=: git rebase -i ...
should behave exactly as
git rebase ...
but as this is a corner case that I will probably never run into it's OK
for me that it doesn't.
Best regards
Uwe
--
Uwe Kleine-König, Software Engineer
Digi International GmbH Branch Breisach, Küferstrasse 8, 79206 Breisach, Germany
Tax: 315/5781/0242 / VAT: DE153662976 / Reg. Amtsgericht Dortmund HRB 13962
next prev parent reply other threads:[~2008-02-15 8:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-14 9:37 another git rebase -i problem Uwe Kleine-König
2008-02-14 12:35 ` Johannes Schindelin
2008-02-14 13:02 ` Uwe Kleine-König
2008-02-14 15:39 ` Johannes Schindelin
2008-02-15 8:10 ` Uwe Kleine-König [this message]
2008-02-15 9:21 ` Uwe Kleine-König
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=20080215081046.GA12091@digi.com \
--to=uwe.kleine-koenig@digi.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/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).