Re: put THEIR commits AFTER my commits with a single rebase command

Am 4/18/2013 7:18, schrieb Ilya Basin: desired result: A---B---C origin/master / D---E---F---G---A'---B'---C' *master Variant 1: git branch -f tmp git reset --hard origin/master git rebase tmp Variant 1a: git reset --hard origin/master git

Re: put THEIR commits AFTER my commits with a single rebase command

On Thu, Apr 18, 2013 at 7:18 AM, Ilya Basin basini...@gmail.com wrote: I asked this on stackoverflow, but no reply. http://stackoverflow.com/questions/15971244/git-put-their-commits-after-my-commits-with-a-single-rebase-command Suppose master and origin/master diverged. I'm on master and I

Re[2]: put THEIR commits AFTER my commits with a single rebase command

JH git cherry-pick master..origin/master Thanks Johan. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re[2]: put THEIR commits AFTER my commits with a single rebase command

JS Perhaps this one: JSgit merge origin/master JSgit rebase ORIG_HEAD JS -- Hannes Wouldn't I have to resolve conflicts twice? BTW, during the rebase, can I tell git to rewrite a different branch upon rebase success or abort? git branch -f tmp origin/master git rebase --onto

Re: put THEIR commits AFTER my commits with a single rebase command

Am 4/18/2013 10:33, schrieb Ilya Basin: JS Perhaps this one: JSgit merge origin/master JSgit rebase ORIG_HEAD JS -- Hannes Wouldn't I have to resolve conflicts twice? Yes. But you did run 'git config rerere.enabled true' when you started with git, didn't you? ;-) Anyway,

put THEIR commits AFTER my commits with a single rebase command

I asked this on stackoverflow, but no reply. http://stackoverflow.com/questions/15971244/git-put-their-commits-after-my-commits-with-a-single-rebase-command Suppose master and origin/master diverged. I'm on master and I want to put the commits from origin/master after my commits and then push