From: sean <seanlkml@sympatico.ca>
To: Paul Jakma <paul@clubi.ie>
Cc: git@vger.kernel.org
Subject: Re: git-reset and clones
Date: Thu, 16 Mar 2006 09:52:13 -0500 [thread overview]
Message-ID: <BAYC1-PASMTP09E59C4F23C4CDF45B1C42AEE70@CEZ.ICE> (raw)
Message-ID: <20060316095213.2a8f650a.seanlkml@sympatico.ca> (raw)
In-Reply-To: <Pine.LNX.4.64.0603161424310.5276@sheen.jakma.org>
On Thu, 16 Mar 2006 14:34:42 +0000 (GMT)
Paul Jakma <paul@clubi.ie> wrote:
> If a git repository has a reset HEAD~X done, then any later pulls in
> clone repositories get /really/ upset, with:
>
> $ git pull
> * refs/heads/origin: does not fast forward to branch 'master' of
> /home/paul/foo-git/;
>
> Type of thing. This seems to be a similar issue to:
>
> http://www.gelato.unsw.edu.au/archives/git/0510/10767.html
>
> The question is has this improved at all since last year? Is there
> anything the origin repository maintainer (the one who did reset) can
> do to recover from this?
It's still not a recommended operation on a repository that is pulled
by others. If you realize you made a mistake by resetting the head,
you can undo the operation afterward with:
$ git reset ORIG_HEAD
Sean
next prev parent reply other threads:[~2006-03-16 14:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-16 14:34 git-reset and clones Paul Jakma
[not found] ` <20060316095213.2a8f650a.seanlkml@sympatico.ca>
2006-03-16 14:52 ` sean [this message]
2006-03-16 15:48 ` Paul Jakma
2006-03-16 14:53 ` Andreas Ericsson
2006-03-16 14:59 ` Andreas Ericsson
[not found] ` <20060316102145.35294eed.seanlkml@sympatico.ca>
2006-03-16 15:21 ` sean
2006-03-17 2:10 ` Junio C Hamano
2006-03-17 19:19 ` Jon Loeliger
2006-03-17 20:39 ` Junio C Hamano
2006-03-17 21:00 ` Jon Loeliger
2006-03-17 21:21 ` Andreas Ericsson
2006-03-19 21:40 ` Petr Baudis
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=BAYC1-PASMTP09E59C4F23C4CDF45B1C42AEE70@CEZ.ICE \
--to=seanlkml@sympatico.ca \
--cc=git@vger.kernel.org \
--cc=paul@clubi.ie \
/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).