git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Felipe Balbi <me@felipebalbi.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: me@felipebalbi.com, git@vger.kernel.org
Subject: Re: fixing duplicated history
Date: Thu, 13 Nov 2008 00:57:48 +0200	[thread overview]
Message-ID: <20081112225739.GB24013@frodo> (raw)
In-Reply-To: <7vod0klfng.fsf@gitster.siamese.dyndns.org>

On Wed, Nov 12, 2008 at 02:53:55PM -0800, Junio C Hamano wrote:
> Felipe Balbi <me@felipebalbi.com> 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

      reply	other threads:[~2008-11-12 23:01 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-12 22:23 fixing duplicated history Felipe Balbi
2008-11-12 22:52 ` Robin Rosenberg
2008-11-12 22:53 ` Junio C Hamano
2008-11-12 22:57   ` Felipe Balbi [this message]

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=20081112225739.GB24013@frodo \
    --to=me@felipebalbi.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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).