Re: [MacPorts] WorkingWithGit modified

2017-02-06 Thread Marko Käning
Hi Kevin, On 07 Feb 2017, at 00:34 , Kevin Reid wrote: > git merge --ff-only yes, that’s mentioned in https://trac.macports.org/wiki/WorkingWithGit#branch Greets, Marko

Re: [MacPorts] WorkingWithGit modified

2017-02-06 Thread Kevin Reid
On Mon, Feb 6, 2017 at 1:57 PM, Marko Käning wrote: > On 06 Feb 2017, at 22:28 , Rainer Müller wrote: > > We do not want to use 'git merge' at this point. This would create an > > extra merge commit in the history and we want to avoid that. Please use > > 'git rebase' instead, but remember that

Re: [MacPorts] WorkingWithGit modified

2017-02-06 Thread Marko Käning
Hi Rainer, On 06 Feb 2017, at 22:28 , Rainer Müller wrote: > We do not want to use 'git merge' at this point. This would create an > extra merge commit in the history and we want to avoid that. Please use > 'git rebase' instead, but remember that you have to run it on BRANCHNAME. yeah, the workf

Re: [MacPorts] WorkingWithGit modified

2017-02-06 Thread Rainer Müller
On 2017-02-06 21:28, MacPorts wrote: > Page "WorkingWithGit" was changed by mkae > Diff URL: > > Revision 76 > Comment: Describe how to work on someone's PR > Changes: > ---8<--8<--8<--8<--8<--8<--8<