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 (Jan 2016, #04; Wed, 20)
Date: Fri, 22 Jan 2016 17:58:30 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.20.1601221757290.2964@virtualbox> (raw)
In-Reply-To: <xmqqk2n33jxq.fsf@gitster.mtv.corp.google.com>
Hi Junio,
On Wed, 20 Jan 2016, Junio C Hamano wrote:
> * bb/merge-marker-crlf (2015-11-24) 1 commit
> - merge-file: consider core.crlf when writing merge markers
>
> Write out merge markers using system end-of-line convention.
>
> Waiting for a re-roll to handle gitattributes.
> ($gmane/281701)
For the record, it is $gmane/281700.
I will send out a replacement series shortly.
Ciao,
Dscho
next prev parent reply other threads:[~2016-01-22 16:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-20 23:33 What's cooking in git.git (Jan 2016, #04; Wed, 20) Junio C Hamano
2016-01-21 12:09 ` jc/rerere-multi (was: What's cooking in git.git (Jan 2016, #04; Wed, 20)) Johannes Sixt
2016-01-21 22:07 ` jc/rerere-multi Junio C Hamano
2016-03-08 22:15 ` jc/rerere-multi Junio C Hamano
2016-01-22 16:58 ` Johannes Schindelin [this message]
2016-01-22 17:57 ` What's cooking in git.git (Jan 2016, #04; Wed, 20) Junio C Hamano
2016-01-26 9:47 ` Lars Schneider
2016-01-26 22:58 ` Junio C Hamano
2016-01-27 8:46 ` Lars Schneider
2016-01-27 18:03 ` Stefan Beller
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.1601221757290.2964@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).