From: Alex Riesen Date: Wed, 13 May 2009 07:41:40 GMT Subject: Re: switching upstream tips Message-ID: <81b0412b0905130041t327ef5f2m3b6d1dfac51fc1b1@mail.gmail.com> In-Reply-To: <4A0A777E.7080506@gmail.com> 2009/5/13 Ittay Dror : >> Alex Riesen wrote: >>> * Reorder my history so that my commits are on top of the tip of the old >>> upstream repository. >> >> Look at "git rebase -i" (interactive rebase) > > well, i was hoping for something more automatic. git rebase will list all > commits without author, so i'll have to manually figure which of them is > mine from the commend and reorder git rebase will list only commits not on upstream (simplified). Has nothing to do with author being absent. >>> * Change the upstream repository reference so it points to the new >>> repository >> >> Just edit your .git/config and re-fetch. > > but then git suddenly sees a bunch of new objects (because of the svn > changes) and i get a lot of conflicts. "git fetch" and "git remote update" do not produce conflicts. You cannot get them unless you also do a merge (like when you do "git merge" or "git pull"). > note that it is not the directory structure that changed, just the svn > repository which is included in the commit comment (by git-svn) and > so changes the commit sha1. Ok, that simplifies everything. Just cherry-pick (see "git cherry-pick") your commits on new upstream. You might find it easiest if you cherry-pick them on commits in new upstream which correspond the old-upstream exactly.