From: Junio C Hamano <junkio@cox.net>
Date: Thu, 09 Mar 2006 23:20:16 GMT
Subject: Re: bug?: stgit creates (unneccessary?) conflicts when pulling
Message-ID: <7vslpr2ojz.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <b0943d9e0603091400o2cd0291h@mail.gmail.com>

"Catalin Marinas" <catalin.marinas@gmail.com> writes:

> Trying to implement this, I've just noticed that git-read-tree has a
> --aggressive option which takes care of the file removals. Adding this
> option lowered the pushing time in StGIT from ~2 min to under 2
> seconds (merges between 2.6.14 and the latest kernel). There's
> probably no need to deal with file removals in pg--merge-all anymore.

Yup, it was originally done to improve the performance of
resolve merge strategy, but I am glad somebody else has found
use for it.