Hi Rainer, On 06 Feb 2017, at 22:28 , Rainer Müller <[email protected]> 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 still think that 'git am' is the easiest option. The following would > be equivalent to fetch and rebase: > > curl -sLS https://github.com/macports/macports-ports/pull/<ID>.patch \ > | git am > > Also, always remember to add a "Closes: #<ID>" to the commit message > before pushing. Otherwise GitHub will not recognize what you are doing. > Use 'git commit --amend' to edit the commit message of the latest > commit; use 'git rebase -i' if you need to edit multiple commits. I’ve included this on the wiki page now. Hope it is more consistent now. Greets, Marko
