From mboxrd@z Thu Jan 1 00:00:00 1970 From: Felipe Balbi Subject: Re: fixing duplicated history Date: Thu, 13 Nov 2008 00:57:48 +0200 Message-ID: <20081112225739.GB24013@frodo> References: <20081112222346.GA24013@frodo> <7vod0klfng.fsf@gitster.siamese.dyndns.org> Reply-To: me@felipebalbi.com Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: me@felipebalbi.com, git@vger.kernel.org To: Junio C Hamano X-From: git-owner@vger.kernel.org Thu Nov 13 00:01:53 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1L0Oid-0007Zp-8N for gcvg-git-2@gmane.org; Thu, 13 Nov 2008 00:01:51 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751298AbYKLXAf (ORCPT ); Wed, 12 Nov 2008 18:00:35 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752810AbYKLXAf (ORCPT ); Wed, 12 Nov 2008 18:00:35 -0500 Received: from ns1.siteground211.com ([209.62.36.12]:58488 "EHLO serv01.siteground211.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750953AbYKLXAf (ORCPT ); Wed, 12 Nov 2008 18:00:35 -0500 Received: from a91-154-126-168.elisa-laajakaista.fi ([91.154.126.168]:14237 helo=frodo) by serv01.siteground211.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) (envelope-from ) id 1L0OhL-00067T-Bu; Wed, 12 Nov 2008 17:00:31 -0600 Content-Disposition: inline In-Reply-To: <7vod0klfng.fsf@gitster.siamese.dyndns.org> User-Agent: Mutt/1.5.18 (2008-05-17) X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - serv01.siteground211.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - felipebalbi.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Wed, Nov 12, 2008 at 02:53:55PM -0800, Junio C Hamano wrote: > Felipe Balbi writes: > > > I have a git tree which history is completely messed up with duplicated > > entries. By reading git man pages I saw that it might be possible to > > delete those duplicated entries with git reflog delete, am I reading it > > right ? > > > > If so, would it cause any problems to the users who already cloned the > > original tree ? I mean, will git see it as a different history line and > > try a merge or will it figure it's the same tree with the duplicated > > entries removed ? > > I assume that you meant "commit" by "entry", and also I assume that you > read "git filter-branch" not "git reflog delete". Then you are right. > > And rewriting history with filter-branch will cause problems to the > downstream users. Yes, you got me right. Hmm, so if it'll cause problems to the downstream users I can't do anything, unfortunately :-( Unless they wanna clone the tree again :-p Thanks for the info Junio. -- balbi