All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Torsten Bögershausen" <tboegi@web.de>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Apr 2016, #06; Thu, 21)
Date: Fri, 22 Apr 2016 10:23:54 -0700	[thread overview]
Message-ID: <xmqqzislpnf9.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <5719B035.6070103@web.de> ("Torsten =?utf-8?Q?B=C3=B6gershaus?= =?utf-8?Q?en=22's?= message of "Fri, 22 Apr 2016 07:01:41 +0200")

Torsten Bögershausen <tboegi@web.de> writes:

> * tb/convert-eol-autocrlf (2016-04-19) 4 commits
>  - convert.c: ident + core.autocrlf didn't work
>  - t0027: test cases for combined attributes
>  - convert: allow core.autocrlf=input and core.eol=crlf
>  - t0027: avoid false "unchanged" due to lstat() matching after a change
>
>  Setting core.autocrlf to 'input' and core.eol to 'crlf' used to be
>  rejected, but because the code gives precedence to core.autcrlf,
>  there is no need to, hence we no longer reject the combination.
>
>  Will merge to 'next'.
> I know that I asked for an early merge of 4/4, but there is a new version
> with a fix for the leaking filter coming out this evening, european time.
> Please hold it.

I'll drop what has been queued and wait for a reroll.

Thanks.

  reply	other threads:[~2016-04-22 17:24 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-21 22:20 What's cooking in git.git (Apr 2016, #06; Thu, 21) Junio C Hamano
2016-04-21 22:32 ` Stefan Beller
2016-04-21 22:48 ` Pranit Bauva
2016-04-22 17:23   ` Junio C Hamano
2016-04-22 22:12     ` Junio C Hamano
2016-04-23 18:42       ` Pranit Bauva
2016-04-21 22:51 ` Santiago Torres
2016-04-21 23:20   ` Junio C Hamano
2016-04-22  4:42 ` Jeff King
2016-04-22 17:22   ` Junio C Hamano
2016-04-22 18:38     ` Jeff King
2016-04-22  5:01 ` Torsten Bögershausen
2016-04-22 17:23   ` Junio C Hamano [this message]
2016-04-22 14:04 ` Johannes Schindelin
2016-04-22 17: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=xmqqzislpnf9.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=tboegi@web.de \
    /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.