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 Chantziarasrea...@gmail.com 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

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 Chantziarasrea...@gmail.com 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

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