From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jul 2016, #03; Fri, 8)
Date: Mon, 11 Jul 2016 08:24:49 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.20.1607110821500.6426@virtualbox> (raw)
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
next prev parent reply other threads:[~2016-07-11 6:24 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-08 22:59 What's cooking in git.git (Jul 2016, #03; Fri, 8) Junio C Hamano
2016-07-09 23:25 ` Eric Wong
2016-07-11 17:51 ` Junio C Hamano
2016-07-09 23:45 ` Eric Wong
2016-07-10 2:52 ` Jeff King
2016-07-10 3:47 ` Eric Wong
2016-07-10 4:45 ` Jeff King
2016-07-10 8:20 ` [PATCH 3/2] hoist out handle_nonblock function for xread and xwrite Eric Wong
2016-07-11 6:24 ` Johannes Schindelin [this message]
2016-07-11 17:13 ` What's cooking in git.git (Jul 2016, #03; Fri, 8) Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.20.1607110821500.6426@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).