From: Andreas Ericsson <ae@op5.se>
To: Ondrej Certik <ondrej@certik.cz>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Michael J Gruber <git@drmicha.warpmail.net>,
Git Mailing List <git@vger.kernel.org>,
Fabian Seoane <fabian@fseoane.net>
Subject: Re: git fast-export | git fast-import doesn't work
Date: Thu, 27 Nov 2008 09:18:30 +0100 [thread overview]
Message-ID: <492E57D6.3010703@op5.se> (raw)
In-Reply-To: <85b5c3130811260921s474bc724hb74b54e21e8be912@mail.gmail.com>
Ondrej Certik wrote:
> On Wed, Nov 26, 2008 at 5:40 PM, Johannes Schindelin
> <Johannes.Schindelin@gmx.de> wrote:
>> Hi,
>>
>> On Wed, 26 Nov 2008, Ondrej Certik wrote:
>>
>>> I am also trying to make the example simpler. I tried to squash the
>>> first uninteresting ~1500 commits into one, but "git rebase -i" uterrly
>>> fails after squashing about 600 commits. Still investigating.
>> 1500... wow.
>>
>> The best idea would probably be to just "edit" the first, delete the rest
>> of the 1500, and then 'git read-tree -u -m <last-of-the-1500-commits>"' on
>> the command line (when git rebase stops after the "edit" command).
>
> That worked, thanks! My original repo:
>
> A -- B -- ... --- D --- E --- ...
>
> where E and the rest of the commits (there are branches and merges in
> there) are the ones that I need to preserve, but all the commits
> between B and D can be squashed (~1500 of them). So I created a
> branch:
>
> A -- B -- ... --- D
>
> then squashed the commits using the technique you described above, so
> now I have:
>
> A -- BD --
>
> and now I would like to append "E -- ..." to it -- is there any way to
> do that? I tried rebase, but that destroys all the branches and merges
> and those are necessary to reproduce the fast-export bug.
>
git rebase -p
If your git is old, you'll need
git rebase -i -p
--
Andreas Ericsson andreas.ericsson@op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
next prev parent reply other threads:[~2008-11-27 8:19 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-25 16:44 git fast-export | git fast-import doesn't work Ondrej Certik
2008-11-25 17:31 ` Michael J Gruber
2008-11-25 20:41 ` Miklos Vajna
2008-11-25 23:39 ` Ondrej Certik
2008-11-25 23:53 ` david
2008-11-25 23:44 ` Ondrej Certik
2008-11-25 17:34 ` Peter Baumann
2008-11-26 0:14 ` Johannes Schindelin
2008-11-26 9:35 ` Ondrej Certik
2008-11-26 10:18 ` Ondrej Certik
2008-11-26 15:35 ` Michael J Gruber
2008-11-26 15:50 ` Ondrej Certik
2008-11-26 16:35 ` Johannes Sixt
2008-11-27 2:05 ` Ondrej Certik
2009-05-03 19:06 ` Ondrej Certik
2008-11-26 16:40 ` Johannes Schindelin
2008-11-26 16:44 ` Michael J Gruber
2008-11-26 17:08 ` Johannes Schindelin
2008-12-07 11:25 ` Alexander Gavrilov
2008-12-08 18:13 ` Johannes Schindelin
2008-11-26 17:21 ` Ondrej Certik
2008-11-27 8:18 ` Andreas Ericsson [this message]
2008-11-26 10:18 ` Michael J Gruber
2008-11-26 12:46 ` Johannes Schindelin
2008-11-26 13:03 ` Ondrej Certik
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=492E57D6.3010703@op5.se \
--to=ae@op5.se \
--cc=Johannes.Schindelin@gmx.de \
--cc=fabian@fseoane.net \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=ondrej@certik.cz \
/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).