[dev-servo] Turning on autoloader rebasing and/or autosquashing

2015-10-15 Thread Lars Bergstrom
Two long-requested features have just been added by barosl to homu (https://github.com/barosl/homu/commit/d7ad33a1d4158fc78da4d86c6318a2f0fc1970cc ): automatic rebasing and autosquash. I’d like to turn both on for t

Re: [dev-servo] Turning on autoloader rebasing and/or autosquashing

2015-10-15 Thread Anthony Ramine
Le 15 oct. 2015 à 14:42, Lars Bergstrom a écrit : > - Automatic rebasing > > Right now, our commit log history is somewhat mumbly-jumbly. The autolander > adds a commit for the pull request detailing who reviewed it, etc., but the > commit itself sits in the history wherever `master` was on th

Re: [dev-servo] Turning on autoloader rebasing and/or autosquashing

2015-10-15 Thread Manish Goregaokar
I like having a linear history, but I still want the merge commit (you can have fast forward merge commits which have a single parent) with the PR and reviewer info. We should check that we still get that. I've not actually had trouble with nonlinear history -- traversal is easy and that's mostly

Re: [dev-servo] Turning on autoloader rebasing and/or autosquashing

2015-10-15 Thread Manish Goregaokar
Barosl just verified in chat that it makes an empty commit with the merge information even when rebasing. I'm now pretty ambivalent towards this. I don't mind linear histories, but ... I can handle graphy ones too. -Manish Goregaokar On Fri, Oct 16, 2015 at 2:08 AM, Manish Goregaokar wrote: >