From mboxrd@z Thu Jan 1 00:00:00 1970 From: Teemu Likonen Subject: Re: how to squash commits Date: Sun, 12 Apr 2009 18:39:10 +0300 Message-ID: <871vrxlw4h.fsf@iki.fi> References: <85b5c3130904111627l7cdd15a1n78271c8e113c4b7a@mail.gmail.com> <87d4bhlxlf.fsf@iki.fi> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: git@vger.kernel.org, mercurial@selenic.com To: Matthieu Moy X-From: mercurial-bounces@selenic.com Sun Apr 12 17:41:03 2009 Return-path: Envelope-to: gcvmd-mercurial@gmane.org Received: from waste.org ([66.93.16.53] helo=mail.waste.org) by lo.gmane.org with esmtp (Exim 4.50) id 1Lt1ni-0008Ov-2s for gcvmd-mercurial@gmane.org; Sun, 12 Apr 2009 17:40:55 +0200 Received: from waste.org (staticwaste [66.93.16.53]) by mail.waste.org (Postfix) with ESMTP id DAB975C8079; Sun, 12 Apr 2009 10:41:30 -0500 (CDT) Received: from jenni2.inet.fi (mta-out.inet.fi [195.156.147.13]) by waste.org (8.13.8/8.13.8/Debian-3) with ESMTP id n3CFdJ3W005205 for ; Sun, 12 Apr 2009 10:39:20 -0500 Received: from mithlond.arda.local (80.220.180.181) by jenni2.inet.fi (8.5.014) id 49CA1E6700BFEC20; Sun, 12 Apr 2009 18:39:12 +0300 Received: from dtw by mithlond.arda.local with local (Exim 4.69) (envelope-from ) id 1Lt1m2-0001yi-Am; Sun, 12 Apr 2009 18:39:10 +0300 In-Reply-To: (Matthieu Moy's message of "Sun\, 12 Apr 2009 17\:18\:33 +0200") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) X-Virus-Scanned: by amavisd-new X-BeenThere: mercurial@selenic.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: mercurial-bounces@selenic.com Errors-To: mercurial-bounces@selenic.com Archived-At: Let's add the Git mailing list to the Cc list if someone there wants to comment. The whole thread is here: http://thread.gmane.org/gmane.comp.version-control.mercurial.general/13283/focus=13295 On 2009-04-12 17:18 (+0200), Matthieu Moy wrote: > Teemu Likonen writes: > >> With the default settings user has 30 days to >> recover the branch's previous state, > > Actually, s/30 days/90 days/ according to "man git-gc". I understand it that objects which are not reachable form the tip of current branches are subject for garbage-collecting in 30 days. For example, let's say we are in "master" branch and do "git reset --hard master~1". It makes the previous HEAD commit unreachable from "master" branch and it can be GCd in 30 days (?). My understanding can be wrong, of course. The manual explainst options like gc.reflogExpire and gc.reflogExpireUnreachable separately but does not draw the big picture how things work. http://www.kernel.org/pub/software/scm/git/docs/git-gc.html