From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gelonida Subject: Re: how to squash a few commits in the past Date: Mon, 03 May 2010 22:45:55 +0200 Message-ID: References: <4BDEA0D7.9090201@drmicha.warpmail.net> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon May 03 22:46:27 2010 connect(): No such file or directory Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1O92X1-0004Ps-0s for gcvg-git-2@lo.gmane.org; Mon, 03 May 2010 22:46:23 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755002Ab0ECUqR (ORCPT ); Mon, 3 May 2010 16:46:17 -0400 Received: from lo.gmane.org ([80.91.229.12]:40061 "EHLO lo.gmane.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754775Ab0ECUqQ (ORCPT ); Mon, 3 May 2010 16:46:16 -0400 Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1O92Wm-0004HM-I3 for git@vger.kernel.org; Mon, 03 May 2010 22:46:08 +0200 Received: from unicorn.dungeon.de ([81.56.82.123]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 03 May 2010 22:46:08 +0200 Received: from gelonida by unicorn.dungeon.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 03 May 2010 22:46:08 +0200 X-Injected-Via-Gmane: http://gmane.org/ connect(): No such file or directory X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: unicorn.dungeon.de User-Agent: Thunderbird 2.0.0.24 (X11/20100411) In-Reply-To: <4BDEA0D7.9090201@drmicha.warpmail.net> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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?