From: Sven Verdoolaege <skimo@kotnet.org>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: rebase problems
Date: Mon, 28 Nov 2005 21:24:29 +0100 [thread overview]
Message-ID: <20051128202428.GA8383MdfPADPa@greensroom.kotnet.org> (raw)
In-Reply-To: <7v4q5wttib.fsf@assigned-by-dhcp.cox.net>
On Mon, Nov 28, 2005 at 12:19:40PM -0800, Junio C Hamano wrote:
> The output seems very inconsistent I am not sure why the first
> message says "Applying HEAD~2", not HEAD~6. What patches do
> you see in .dotest/ directory, and are they numbered in the
> right order? HEAD~6 should be numbered 0001 and that should be
> the first one that was applied.
Ah! It seems .dotest still contained some stuff from a previous
(expectedly) failed rebase.
Rebase worked after rm -rf'ing .dotest
Maybe rebase should clean up .dotest or at least warn about
an existing .dotest ?
Thanks,
skimo
next prev parent reply other threads:[~2005-11-28 20:24 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-28 14:58 rebase problems Sven Verdoolaege
2005-11-28 20:19 ` Junio C Hamano
2005-11-28 20:24 ` Sven Verdoolaege [this message]
2005-11-28 21:02 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2010-11-08 18:19 Rebase problems Maaartin
2010-11-08 18:33 ` Wincent Colaiuta
2010-11-08 19:59 ` Maaartin-1
2010-11-12 0:07 ` Maaartin
2010-11-08 19:30 ` Andreas Schwab
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=20051128202428.GA8383MdfPADPa@greensroom.kotnet.org \
--to=skimo@kotnet.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=skimo@liacs.nl \
/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).