From: Thomas Rast <trast@student.ethz.ch>
To: Graeme Geldenhuys <graemeg@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Rewrite history then pull repository?
Date: Mon, 13 Jul 2009 10:58:10 +0200 [thread overview]
Message-ID: <200907131058.15118.trast@student.ethz.ch> (raw)
In-Reply-To: <h3es3p$ie6$1@ger.gmane.org>
[-- Attachment #1: Type: Text/Plain, Size: 836 bytes --]
Graeme Geldenhuys wrote:
>
> I pushed a repository to Github (a mirror of SubVersion repository). I
> then had some screwup with 'git svn rebase' when I should have used 'git
> svn fetch'. Anyway I managed to fix the issue locally and then forced
> the push to GitHub. This rewrote the history for the HEAD commit and
> gave it a different date and SHA1.
>
> What will now happen to developers that cloned the repository before the
> history rewrite and then do a 'git pull' after the history rewrite?
See the "Recovering From Upstream Rebase" section in man git-rebase,
also available online at
http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html
(especially useful if your local git is older than 1.6.1 and doesn't
have this section yet).
--
Thomas Rast
trast@{inf,student}.ethz.ch
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2009-07-13 8:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-13 8:42 Rewrite history then pull repository? Graeme Geldenhuys
2009-07-13 8:58 ` Thomas Rast [this message]
2009-07-13 9:38 ` Graeme Geldenhuys
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=200907131058.15118.trast@student.ethz.ch \
--to=trast@student.ethz.ch \
--cc=git@vger.kernel.org \
--cc=graemeg@gmail.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).