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

[Chris Adams]

Hi chaps

This is little off-topic, as it doesn't purely apply to Ruby, but hopefully
it should be useful.

We're using something like a github pull request based workflow where I'm
working for getting code into master for deploy - it's described in the
links:

https://github.com/blog/1557-github-flow-in-the-browser
http://scottchacon.com/2011/08/31/github-flow.html

However, having a nice tidy git history is a good thing on a codebase, and
when merging this in, by default all the bitty commits are added in along
with the merge, leaving a fairly messy history.

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?

Extra points for writing in ruby pseudo code.

Ta,

Chris





-- 
Chris Adams

mob: 07974 368 229
tel: 0203 322 5777
skype: chris.d.adams
twitter: mrchrisadams
www: chrisadams.me.uk
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.lrug.org/pipermail/chat-lrug.org/attachments/20130716/9f461966/attachment.html>