Re: Merged branch with history

[Dustin J. Mitchell]

On Sun, Aug 2, 2009 at 3:56 AM, Peter Simons<address@hidden> wrote:
> Now, the common consensus I perceive these days is that we shouldn't
> rely on Gitweb that much anyway and that we should rather generate a
> custom representation of every macro's history and include that in
> the documentation. If we go that road, then there is no problem
> breaking the macro history in Gitweb. Under these circumstances, a
> straight master/maint merge without any fancy branch re-writing
> would be fine, IMHO.
>
> Does that sound reasonable?

Sure, but this fancy merge is already done, and doesn't really have a
significant downside.  I can just go ahead and commit it..

Dustin

-- 
Open Source Storage Engineer
http://www.zmanda.com