News for hackers. Stuff that matters.
Re:Abandoning Gitflow and GitHub in favour of Gerrit by superuser2 on Tuesday April 05, 2016 @04:23PM (#11434046)
Phabricator[0] is awesome. Diffs (like PRs) contain several commits, but are reviewed, discussed, and "landed" as a unit with an auto-generated commit message referring to the Diff description and a link to read its history, but "master" is a linear sequence of Diffs being landed. You can also configure all kinds of rules like "X person must sign off on any changes to this file" or "do not merge code to master unless it is approved by N people other than the author." The UI is a bit clunky but I love it, and it's open source and very flexible.

[0] http://phabricator.org/

Re:Abandoning Gitflow and GitHub in favour of Gerrit by finnh on Tuesday April 05, 2016 @04:45PM (#11434241)
I used phabricator at my last job and was really impressed. Now I'm using Gerrit and I'm less impressed (but still getting used to it).

You say clunky, but Phabricator's UI makes Gerrit look like a WAP app.

Re:Abandoning Gitflow and GitHub in favour of Gerrit by eridius on Tuesday April 05, 2016 @05:41PM (#11434755)
When you say a linear sequence of Diffs being landed, do you mean it commits squashed merges, or does it create actual merges (so the history of master includes all the commits in each Diff)?
Re:Abandoning Gitflow and GitHub in favour of Gerrit by superuser2 on Tuesday April 05, 2016 @09:43PM (#11436008)
AFAIK this is configurable. We did squashed merges, which I quite liked, because "git log" for master read nicely but you could go look up the more granular history if you wanted to.
Re:Abandoning Gitflow and GitHub in favour of Gerrit by djtide on Wednesday April 06, 2016 @04:54PM (#11442012)
hopefully it's slightly less clunky today, just wrapped up the semi-annual refresh this past week. Still... we have our fair share of "-isms".