From: Gelonida <gelonida@gmail.com>
To: git@vger.kernel.org
Subject: Re: how to squash a few commits in the past
Date: Mon, 03 May 2010 22:45:55 +0200 [thread overview]
Message-ID: <hrncm3$pg8$1@dough.gmane.org> (raw)
In-Reply-To: <4BDEA0D7.9090201@drmicha.warpmail.net>
Hi Michael,
Michael J Gruber wrote:
> Gelonida venit, vidit, dixit 03.05.2010 11:33:
>>
>>
>> The plan would be:
>> - create a new git repository without the huge file
>> - let everybody clone the new repository and continue working.
>>
>>
>> I thought, that I could squash the commit adding the file, removing the file and
>> the commits in between into one commit.
>
> You don't need to squash the commits in between. Use git rebase -i A^ if
> A is the commit introducing the large file. Then, either edit that first
> commit (to not add the file) or reorder so that the removal commit is
> squashed into A.
I seem to misunderstand your suggestion.
git rebase -i 740ebdf9b^
returns following output
> fatal: Needed a single revision
> Invalid base
what am I missing?
next prev parent reply other threads:[~2010-05-03 20:46 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-03 9:33 how to squash a few commits in the past Gelonida
2010-05-03 10:09 ` Michael J Gruber
2010-05-03 20:45 ` Gelonida [this message]
2010-05-03 20:55 ` Gelonida
2010-05-03 21:20 ` Gelonida
2010-05-05 13:19 ` Ramkumar Ramachandra
2010-05-05 21:41 ` Gelonida
2010-05-06 6:45 ` 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='hrncm3$pg8$1@dough.gmane.org' \
--to=gelonida@gmail.com \
--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).