Re: Why not rebase instead of merge?

On Fri, Feb 22, 2013 at 11:54 AM, Austin Seipp wrote:

In fact, the only major feature overhaul/addition I can think of recently that was *not* consolidated into a mega patch near the end of development was the new I/O manager that hit base. That was actually branch-merged.

I merged that and I followed the typical git practice of rebasing but committing with --no-ff to create a single merge commit so that it's easier to find the whole feature in the history.