Why not rebase instead of merge?

[Johan Tibell]

On Fri, Feb 22, 2013 at 8:50 AM, Geoffrey Mainland <mainland at apeiron.net>wrote:

> I don't want to bike shed, but the prevalence of empty merge commits in
> the repo seems both undesirable and avoidable. I always rebase my work
> instead of merge. Is there a reason this is not standard practice in the
> repo? It certainly makes for a nicer history.
>

When we switched we didn't want to affect people's current workflow too
much (i.e. they already had to learn git so we kept rebasing out of it at
the beginning.)

-- Johan
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.haskell.org/pipermail/ghc-devs/attachments/20130222/c38d43f3/attachment.htm>