From: Emily Shaffer <emilyshaffer@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Derrick Stolee <stolee@gmail.com>, git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jan 2021, #02; Fri, 8)
Date: Fri, 15 Jan 2021 12:08:33 -0800 [thread overview]
Message-ID: <YAH2Qc/ad+P9Pf26@google.com> (raw)
In-Reply-To: <xmqqturirnm5.fsf@gitster.c.googlers.com>
On Fri, Jan 15, 2021 at 11:44:50AM -0800, Junio C Hamano wrote:
>
> Derrick Stolee <stolee@gmail.com> writes:
>
> > Thanks for dealing with this fallout. Sorry for the mixup.
> >
> >> Helped-by: Emily Shaffer <emilyshaffer@google.com>
> >
> > Would it be appropriate to convert this to a Co-authored-by?
>
> Or more like "Inspired-by-a-patch-by". Also you three have about
> the same amount of input and deserve credit.
>
> Sorry, but it already is on 'next', which will be discarded in a few
> months when the new cycle begins, so I am not sure if it is worth
> reverting and reapplying with updated credit trailers.
>
> FWIW, I ended up redoing the merge and did "checkout -m" to recreate
> conflicts, and then looked for "config.*pwd" in the block of text
> that came from the "part-4" topic and fixed them up manually. I
> then compared the result of this new merge with the earlier merge
> that had the issue. The resulting diff is what went into the patch
> you are responding to. It is good that we had Emily's input as a
> comparison material to see that both of us independently touched the
> same places to fix.
Thanks for the action on this, glad to see it resolved in 'next' when I
pull today.
- Emily
next prev parent reply other threads:[~2021-01-15 20:09 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-08 19:22 What's cooking in git.git (Jan 2021, #02; Fri, 8) Junio C Hamano
2021-01-09 10:55 ` Ævar Arnfjörð Bjarmason
2021-01-09 21:28 ` Junio C Hamano
2021-01-09 22:05 ` brian m. carlson
2021-01-09 23:20 ` Junio C Hamano
2021-01-11 1:53 ` brian m. carlson
2021-01-11 19:04 ` Junio C Hamano
2021-01-12 14:00 ` Ævar Arnfjörð Bjarmason
2021-01-14 23:52 ` Emily Shaffer
2021-01-14 23:56 ` Emily Shaffer
2021-01-15 7:22 ` Junio C Hamano
2021-01-15 0:29 ` brian m. carlson
2021-01-15 1:44 ` Junio C Hamano
2021-01-16 16:23 ` Ævar Arnfjörð Bjarmason
2021-01-17 17:15 ` Jeff King
2021-01-17 20:22 ` Ævar Arnfjörð Bjarmason
2021-01-10 19:00 ` Ævar Arnfjörð Bjarmason
2021-01-11 0:21 ` Junio C Hamano
2021-01-09 21:38 ` David Aguilar
2021-01-09 23:08 ` Junio C Hamano
2021-01-14 23:06 ` Emily Shaffer
2021-01-15 1:50 ` Junio C Hamano
2021-01-15 2:24 ` Taylor Blau
2021-01-15 2:44 ` Taylor Blau
2021-01-15 2:36 ` Derrick Stolee
2021-01-15 2:54 ` Derrick Stolee
2021-01-15 6:36 ` Junio C Hamano
2021-01-15 6:38 ` Junio C Hamano
2021-01-15 11:36 ` Derrick Stolee
2021-01-15 19:44 ` Junio C Hamano
2021-01-15 20:08 ` Emily Shaffer [this message]
2021-01-15 20:59 ` Junio C Hamano
2021-01-15 19:52 ` Jeff King
2021-01-15 21:40 ` 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=YAH2Qc/ad+P9Pf26@google.com \
--to=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=stolee@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.