From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Wed, 25 May 2011 17:42:28 GMT
Subject: Re: Merge made by recursive?
Message-ID: <BANLkTikRW+k38sHcokL=FsNmLRNF0+E--w@mail.gmail.com>
In-Reply-To: <loom.20110525T192418-887@post.gmane.org>

Hi Shawn,

Shawn Ligocki writes:
> Is this intentionally bad grammar? Every time I see it, I cringe a little. What
> does it even mean? That it merged incrementally through each subsequent revision?

I suppose it's yet another quirk I've got used to -- "recursive"
refers to the merge strategy that was used; see git-merge(1). We can
definitely make the Porcelain say something nicer like `merged
successfully using "recursive" merge strategy`.

Patches are welcome: see Documentation/SubmittingPatches :)

-- Ram