Abandoning Gitflow and GitHub in favour of Gerrit

Re:Abandoning Gitflow and GitHub in favour of Gerrit by quicklyfrozen on Tuesday April 05, 2016 @11:52AM (#11431378)

You can create a PR from the upstream to your repo, then accept that PR. (I know, that's not immediately intuitive, but at least you can do it without pulling a local copy.)

[ Parent | on HN ]

Re:Abandoning Gitflow and GitHub in favour of Gerrit by yxlx on Tuesday April 05, 2016 @01:11PM (#11432230)

I tried that once but ended up with a merge-commit with my name on it in the history of my "fork". Is it possible to not end up with such merge-commits?

[ Parent | on HN ]

Re:Abandoning Gitflow and GitHub in favour of Gerrit by quicklyfrozen on Tuesday April 05, 2016 @07:37PM (#11435462)

I don't think so -- you'll need to do something like a git rebase, and there's no way to do that via the GitHub UI.

I know many don't like the 'dirty' history, but I like knowing exactly how the updates made it into my repo.

[ Parent | on HN ]