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)?
[ Parent
| on HN ]
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.