From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>
Cc: "Stefan Beller" <sbeller@google•com>,
"Yi EungJun" <semtlenori@gmail•com>,
"Git List" <git@vger•kernel.org>,
"Yi EungJun" <eungjun.yi@navercorp•com>,
"Peter Krefting" <peter@softwolves•pp.se>,
"Michael Blume" <blume.mike@gmail•com>,
"Torsten Bögershausen" <tboegi@web•de>
Subject: Re: [PATCH v9 1/1] http: Add Accept-Language header if possible
Date: Thu, 26 Feb 2015 14:13:16 -0800 [thread overview]
Message-ID: <xmqq1tlcl3sz.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20150226220609.GA24663@peff.net> (Jeff King's message of "Thu, 26 Feb 2015 17:06:10 -0500")
Jeff King <peff@peff•net> writes:
> On Thu, Feb 26, 2015 at 01:47:34PM -0800, Stefan Beller wrote:
>
>> On Thu, Feb 26, 2015 at 1:42 PM, Junio C Hamano <gitster@pobox•com> wrote:>
>> > Here is what I queued. Thanks.
>>
>> I did not follow the thread if there are any intermediate patches,
>> though it applied cleanly.
>
> What Junio posted is missing the hunk to drop the old static definition
> of get_preferred_languages from http.c.
I am still scratching my head to see how this happened, but I think
when I did
$ git checkout ye/http-accept-language
$ git apply -3 $gmane/264422
I took the wrong side of the confict in http.c
Thanks both for noticing. Now it is fixed up.
next prev parent reply other threads:[~2015-02-26 22:13 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-19 17:58 [PATCH v4 0/1] http: Add Accept-Language header if possible Yi EungJun
2014-07-19 17:58 ` [PATCH v4 1/1] " Yi EungJun
2014-07-21 19:01 ` Junio C Hamano
2014-08-03 7:35 ` Yi, EungJun
2014-12-02 12:12 ` [PATCH v5 0/1] " Yi EungJun
2014-12-02 12:12 ` [PATCH v5 1/1] " Yi EungJun
2014-12-03 18:22 ` Junio C Hamano
2014-12-03 19:31 ` Eric Sunshine
2014-12-03 21:37 ` Junio C Hamano
2014-12-03 22:00 ` Michael Blume
2014-12-03 22:06 ` Michael Blume
2014-12-22 16:44 ` [PATCH v6 0/1] " Yi EungJun
2014-12-22 16:44 ` [PATCH v6 1/1] " Yi EungJun
2014-12-22 19:34 ` Junio C Hamano
2014-12-24 20:35 ` Eric Sunshine
2014-12-29 16:18 ` Junio C Hamano
2015-01-18 12:23 ` [PATCH v7 0/1] " Yi EungJun
2015-01-18 12:26 ` [PATCH v7 1/1] " Yi EungJun
2015-01-18 15:14 ` Torsten Bögershausen
2015-01-19 20:21 ` [PATCH v6 0/1] " Eric Sunshine
2015-01-22 7:54 ` [PATCH v7 1/1] " Junio C Hamano
2015-01-27 15:51 ` [PATCH v8 0/1] " Yi EungJun
2015-01-27 15:51 ` [PATCH] " Yi EungJun
2015-01-27 23:34 ` Junio C Hamano
2015-01-28 6:15 ` Junio C Hamano
2015-01-28 11:59 ` Yi, EungJun
2015-01-28 12:04 ` [PATCH v9 0/1] " Yi EungJun
2015-01-28 12:04 ` [PATCH v9 1/1] " Yi EungJun
2015-02-25 22:52 ` Junio C Hamano
2015-02-26 3:04 ` Jeff King
2015-02-26 3:10 ` Jeff King
2015-02-26 20:59 ` Junio C Hamano
2015-02-26 21:33 ` Jeff King
2015-02-26 21:42 ` Junio C Hamano
2015-02-26 21:47 ` Stefan Beller
2015-02-26 22:06 ` Jeff King
2015-02-26 22:07 ` Jeff King
2015-02-26 22:26 ` Stefan Beller
2015-02-26 22:36 ` Jeff King
2015-02-26 22:45 ` Jeff King
2015-02-26 23:29 ` Junio C Hamano
2015-02-26 22:13 ` Junio C Hamano [this message]
2015-01-29 6:19 ` [PATCH v9 0/1] " Junio C Hamano
2015-01-30 17:23 ` Yi, EungJun
2015-03-06 16:13 ` [PATCH] http: Include locale.h when using setlocale() Ævar Arnfjörð Bjarmason
2015-03-06 19:01 ` 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=xmqq1tlcl3sz.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=blume.mike@gmail$(echo .)com \
--cc=eungjun.yi@navercorp$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=peff@peff$(echo .)net \
--cc=peter@softwolves$(echo .)pp.se \
--cc=sbeller@google$(echo .)com \
--cc=semtlenori@gmail$(echo .)com \
--cc=tboegi@web$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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