Re: Why not rebase instead of merge?

22 Feb 2013


      Ah yes, I can see this more clearly now looking at the history. Thanks
for correcting me.

On Fri, Feb 22, 2013 at 1:58 PM, Johan Tibell  wrote:
...
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.
--
Regards,
Austin