[LRUG] Keeping a nice git history with a pull request workflow on github

[Tom Stuart]

On 16 Jul 2013, at 15:31, Chris Adams <wave at chrisadams.me.uk> wrote:
> Anyone on the list found a nice way to combine the transparency and code review of a pull request based workflow, with the tidiness a well maintained git history?

Collaborate on the branch as required, then rebase before merging, doing any reordering / squashing / fixuping as required to leave a nice history. Merge with --no-ff to leave a nice, empty merge commit (with non-bullshit commit message) annotating the collection of commits that have been rebased & merged.

Cheers,
-Tom