From: Junio C Hamano <gitster@pobox.com>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: linux@horizon.com, git@vger.kernel.org
Subject: Re: How to do a reverse rebase?
Date: Sun, 19 Aug 2007 23:33:29 -0700 [thread overview]
Message-ID: <7vr6ly90li.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20070820055809.GZ27913@spearce.org> (Shawn O. Pearce's message of "Mon, 20 Aug 2007 01:58:09 -0400")
"Shawn O. Pearce" <spearce@spearce.org> writes:
>> Is there an easier way?
>
> I don't think so. To do the merge of those files we need a working
> directory to operate in; that working directory is the one you have.
Actually, if the rebase is really tine compared to the
differences between the branches, we _could_ do that without
using the real work tree.
Prepare a "for rebase" index, with an empty temporary directory
as the work tree, and use the merge machinery to do the
necessary per-path and contents merge all inside that temporary
directory. As the merge machiery is designed to be usable
inside an empty directory and treat "missing" work tree files as
if they are unchanged since index, the checkout in this
temporary directory would be kept to the minimum.
next prev parent reply other threads:[~2007-08-20 6:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-20 5:32 How to do a reverse rebase? linux
2007-08-20 5:58 ` Shawn O. Pearce
2007-08-20 6:33 ` Junio C Hamano [this message]
2007-08-20 10:39 ` linux
2007-08-20 9:49 ` Johannes Sixt
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=7vr6ly90li.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=linux@horizon.com \
--cc=spearce@spearce.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).