Re: [git-users] Forward-porting commits - merge or rebase?

2012-05-11 Thread Nikos Chantziaras
On 12/05/12 01:09, Konstantin Khomoutov wrote: On Fri, May 11, 2012 at 09:50:18PM +0300, Nikos Chantziaras wrote: [...] The problem with rebasing and a public repo would only appear here if you would have managed to push exp into that public repo after committing X or Y. If the exp branch ends

Re: [git-users] Forward-porting commits - merge or rebase?

2012-05-11 Thread Konstantin Khomoutov
On Fri, May 11, 2012 at 09:50:18PM +0300, Nikos Chantziaras wrote: [...] > >The idea with rebasing is that you can rebase any series of commits > >(ending with the branch's tip commit) on top of technically any other > >series of commit. You do not have to rebase the whole branch. "To > >rebase

Re: [git-users] Forward-porting commits - merge or rebase?

2012-05-11 Thread Nikos Chantziaras
On 11/05/12 19:38, Konstantin Khomoutov wrote: On Fri, 11 May 2012 18:35:03 +0300 Nikos Chantziaras wrote: [...] I don't want to push something that would require others to rebase. But from the Pro Git book, in the "3.6 Rebasing" section, I had this in mind: Do not rebase commits that you

Re: [git-users] Forward-porting commits - merge or rebase?

2012-05-11 Thread Konstantin Khomoutov
On Fri, 11 May 2012 18:35:03 +0300 Nikos Chantziaras wrote: [...] > > The consequence is that if you push a branch containing commits > > ...->A->B-C > > (with C being the tip commit) to a public repo, then rebase these > > three commits to produce > > ...->A'->B'->C' > > and push it again (this

Re: [git-users] Forward-porting commits - merge or rebase?

2012-05-11 Thread Nikos Chantziaras
On 11/05/12 16:36, Konstantin Khomoutov wrote: On Fri, 11 May 2012 04:24:07 -0700 (PDT) Nikos Chantziaras wrote: I'm a bit puzzled on how to best forward-port commits from a stable branch ("master" in this case), to my experimental branch (let's call it "exp"). Both branches are pushed to a pu

Re: [git-users] Forward-porting commits - merge or rebase?

2012-05-11 Thread Konstantin Khomoutov
On Fri, 11 May 2012 04:24:07 -0700 (PDT) Nikos Chantziaras wrote: > I'm a bit puzzled on how to best forward-port commits from a stable > branch ("master" in this case), to my experimental branch (let's call > it "exp"). Both branches are pushed to a public repo. Work that goes > on in master sh

[git-users] Forward-porting commits - merge or rebase?

2012-05-11 Thread Nikos Chantziaras
Hello. I'm a bit puzzled on how to best forward-port commits from a stable branch ("master" in this case), to my experimental branch (let's call it "exp"). Both branches are pushed to a public repo. Work that goes on in master should be forward-ported to exp (I prefer forward-porting rather t