Avoid merge commits if possible

[purpleidea]

Yesterday I submitted a very simple patch which applied directly to git master:

dd29b1f

Thanks for merging it, however it was done with a merge commit:

644521d

I'd like to propose that we avoid merge commits as much as possible, and in particular when there is only one pending patch, we should get it rebase to git master so that it can apply with a fast forward.

IOW, don't click the green merge button in it's current state. Much better to change the button to default to rebase if we plan on using it at all, or apply these kinds of patches with the cli.

Just my $0.02

Cheers!

[purpleidea]

Here's a nice example for this: #121

[vincentbernat]

I don't have a strong opinion on that. Rebase or regular merge are fine by me. Squash is not.

[purpleidea]

Yes, I agree we shouldn't squash. Fast forwarding is my preferred approach when available. Keeps the history logical and easy to understand.

[rgbkrk]

Rebase is good, we can set that as the default on the repo.