* Rewrite history then pull repository? @ 2009-07-13 8:42 Graeme Geldenhuys 2009-07-13 8:58 ` Thomas Rast 0 siblings, 1 reply; 3+ messages in thread From: Graeme Geldenhuys @ 2009-07-13 8:42 UTC (permalink / raw) To: git 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/ ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Rewrite history then pull repository? 2009-07-13 8:42 Rewrite history then pull repository? Graeme Geldenhuys @ 2009-07-13 8:58 ` Thomas Rast 2009-07-13 9:38 ` Graeme Geldenhuys 0 siblings, 1 reply; 3+ messages in thread From: Thomas Rast @ 2009-07-13 8:58 UTC (permalink / raw) To: Graeme Geldenhuys; +Cc: git [-- 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 --] ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Rewrite history then pull repository? 2009-07-13 8:58 ` Thomas Rast @ 2009-07-13 9:38 ` Graeme Geldenhuys 0 siblings, 0 replies; 3+ messages in thread From: Graeme Geldenhuys @ 2009-07-13 9:38 UTC (permalink / raw) To: git Thomas Rast wrote: > > See the "Recovering From Upstream Rebase" section in man git-rebase, > also available online at Thanks for the link. Luckily I had a clone (backup) of my repository before the upstream rebase. So I could play around and see what happens to developers downstream. I used the 'gitk --all' to see the history and visualize what I had to do. I managed to figure out that 'git rebase origin' would solve the problem, and the documentation you mentioned confirmed that. :-) Thanks again for the quick reply. Regards, - Graeme - -- fpGUI Toolkit - a cross-platform GUI toolkit using Free Pascal http://opensoft.homeip.net/fpgui/ ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-07-13 9:39 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2009-07-13 8:42 Rewrite history then pull repository? Graeme Geldenhuys 2009-07-13 8:58 ` Thomas Rast 2009-07-13 9:38 ` Graeme Geldenhuys
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).