From: Graeme Geldenhuys <graemeg@gmail.com>
To: git@vger.kernel.org
Subject: Rewrite history then pull repository?
Date: Mon, 13 Jul 2009 10:42:42 +0200 [thread overview]
Message-ID: <h3es3p$ie6$1@ger.gmane.org> (raw)
Hi,
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?
Will git automatically sort out the mess, or is it going to post some
warning? The content of that screwed up commit stayed exactly the same,
only the date of the commit changed which then generated a different SHA1.
If a warning, what must they do to resolve the issue on there PC's?
Regards,
- Graeme -
--
fpGUI Toolkit - a cross-platform GUI toolkit using Free Pascal
http://opensoft.homeip.net/fpgui/
next reply other threads:[~2009-07-13 8:43 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-13 8:42 Graeme Geldenhuys [this message]
2009-07-13 8:58 ` Rewrite history then pull repository? Thomas Rast
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='h3es3p$ie6$1@ger.gmane.org' \
--to=graemeg@gmail.com \
--cc=git@vger.kernel.org \
/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).