From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 11 Jul 2016 06:24:49 GMT
Subject: Re: What's cooking in git.git (Jul 2016, #03; Fri, 8)
Message-ID: <alpine.DEB.2.20.1607110821500.6426@virtualbox>
In-Reply-To: <xmqq37njlora.fsf@gitster.mtv.corp.google.com>

Hi Junio,

On Fri, 8 Jul 2016, Junio C Hamano wrote:

> * js/am-call-theirs-theirs-in-fallback-3way (2016-07-08) 1 commit
>  - am: counteract gender bias
> 
>  One part of "git am" had an oddball helper function that called
>  stuff from outside "his" as opposed to calling what we have "ours",
>  which was not gender-neutral and also inconsistent with the rest of
>  the system where outside stuff is usuall called "theirs" in
>  contrast to "ours".
> 
>  Will merge to 'next'.

What about the am-call-merge-recursive-directly patch series? As I
demonstrated by rebasing it to `pu`, it is actually not butchering the
smudge/clean pathway as you suggested.

I am a bit at a loss here: what can I do to get this picked up?

Ciao,
Dscho