public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>
Cc: git@vger•kernel.org
Subject: Re: What's cooking in git.git (Dec 2015, #02; Fri, 4)
Date: Fri, 04 Dec 2015 16:21:36 -0800	[thread overview]
Message-ID: <xmqqvb8doicv.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20151204232436.GB15064@sigill.intra.peff.net> (Jeff King's message of "Fri, 4 Dec 2015 18:24:36 -0500")

Jeff King <peff@peff•net> writes:

> You may want to update this in the whats-cooking template. :)

X-<.  This is a bit tricky in that most of the time I want to retain
the customization I made to the top-portion, and this part does not
go through a three-way merge as it probably should.

>
> diff --git a/whats-cooking.txt b/whats-cooking.txt
> index 43394b7..04f6208 100644
> --- a/whats-cooking.txt
> +++ b/whats-cooking.txt
> @@ -25,7 +25,11 @@ and all topic branches at:
>  
>      https://github.com/peff/git/
>  
> -But note that I will _not_ be pushing to kernel.org.
> +You can find the changes described here in the integration branches
> +of the repositories listed at
> +
> +    http://git-blame.blogspot.com/p/git-public-repositories.html
> +

Thanks, but the patch is not quite right, as I won't be pushing to
peff/git ;-)

  reply	other threads:[~2015-12-05  0:21 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-04 23:15 What's cooking in git.git (Dec 2015, #02; Fri, 4) Junio C Hamano
2015-12-04 23:24 ` Jeff King
2015-12-05  0:21   ` Junio C Hamano [this message]
2015-12-06 16:12 ` Edmundo Carmona Antoranz
2015-12-07  4:01   ` Eric Sunshine
2015-12-07 20:46   ` Jeff King
2015-12-08  0:24     ` 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=xmqqvb8doicv.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=peff@peff$(echo .)net \
    /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