From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Johannes Sixt <j.sixt@viscovery.net>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] rebase --interactive: Compute upstream SHA1 before switching branches
Date: Mon, 2 Jun 2008 16:29:17 +0100 (BST) [thread overview]
Message-ID: <alpine.DEB.1.00.0806021628260.13507@racer.site.net> (raw)
In-Reply-To: <4843FD44.90905@viscovery.net>
Hi,
On Mon, 2 Jun 2008, Johannes Sixt wrote:
> From: Johannes Sixt <johannes.sixt@telecom.at>
>
> If the upstream argument to rebase (the first argument) was relative to
> HEAD and the name of the branch to rebase (the second argument) was given,
> the upstream would have been interpreted relative to the second argument.
> In particular, this command
>
> git rebase -i HEAD topic
>
> would always finish with "Nothing to do". (a1bf91e fixed the same issue
> for non-interactive rebase.)
>
> Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> I made this with -U5 so that you can see the checkout in the context.
>
> BTW, methinks, this checkout is unnecessary, since before the rebase
> begins, there is a 'git checkout $ONTO', and the branch switching is
> certainly not needed to compute the todo list...
It is needed to determine which branch to update after finish.
Ciao,
Dscho
next prev parent reply other threads:[~2008-06-02 15:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-02 14:01 [PATCH] rebase --interactive: Compute upstream SHA1 before switching branches Johannes Sixt
2008-06-02 15:29 ` Johannes Schindelin [this message]
2008-06-03 2:28 ` Junio C Hamano
2008-06-03 13:55 ` Johannes Schindelin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.1.00.0806021628260.13507@racer.site.net \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).