On Mon, Feb 6, 2017 at 1:57 PM, Marko Käning <mk-macpo...@posteo.net> wrote:
> On 06 Feb 2017, at 22:28 , Rainer Müller <rai...@macports.org> 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 workflow I used before coming to the merge included rebasing of > the master branch on top upstream. That wasn’t obvious from my text. Sorry! > I'm not following this discussion in detail, so sorry if this is noise, but if you want a workflow where you do only merges that don't create merge commits, you can use git merge --ff-only <branch> to ensure that no merge commit is created (it will fail if it cannot fast-forward).
