From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Fri, 8 Dec 2006 22:31:52 +0000 (+0000)
Subject: Don't always use git-merge-recursive because of speed
X-Git-Tag: v0.14.3~387
X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/f3b4fbfff9f3042a406f25b8201582c3351cd1ca?hp=f3b4fbfff9f3042a406f25b8201582c3351cd1ca

Don't always use git-merge-recursive because of speed

There are situations like picking patches, folding a patch onto a base
or synchronising patches where the distance between base and heads is
in general small. In this case, git-read-tree --aggressive is much
faster. We currently use the recursive merge when picking or pushing a
patch (the base change might involve some renames).

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
---