All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: me@felipebalbi.com
Cc: git@vger.kernel.org
Subject: Re: fixing duplicated history
Date: Wed, 12 Nov 2008 14:53:55 -0800	[thread overview]
Message-ID: <7vod0klfng.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20081112222346.GA24013@frodo> (Felipe Balbi's message of "Thu, 13 Nov 2008 00:23:51 +0200")

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.

  parent reply	other threads:[~2008-11-12 22:55 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 [this message]
2008-11-12 22:57   ` Felipe Balbi

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=7vod0klfng.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=me@felipebalbi.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.