From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
git@vger.kernel.org, Jeff Hostetler <jeffhost@microsoft.com>,
Pat Thoyts <patthoyts@users.sourceforge.net>
Subject: Re: [PATCH v3 1/6] Fix build with core.autocrlf=true
Date: Tue, 23 May 2017 12:35:45 +0900 [thread overview]
Message-ID: <xmqqh90cmei6.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170522175709.GC17710@aiede.svl.corp.google.com> (Jonathan Nieder's message of "Mon, 22 May 2017 10:57:09 -0700")
Jonathan Nieder <jrnieder@gmail.com> writes:
> Junio, how do you prefer to handle this in git.git? Would you need to
> amend the patch to remove the git-gui/.gitattributes change and wait
> to get it from Pat, or is getting the same change twice okay?
Yes, getting the same change twice should be fine. I'll see
conflicts when I update from Pat when it happens next time, but we
know what the resolution should be already.
next prev parent reply other threads:[~2017-05-23 3:35 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-02 12:29 [PATCH 0/5] Abide by our own rules regarding line endings Johannes Schindelin
2017-05-02 12:30 ` [PATCH 1/5] Fix build with core.autocrlf=true Johannes Schindelin
2017-05-02 12:30 ` [PATCH 2/5] git-new-workdir: mark script as LF-only Johannes Schindelin
2017-05-02 12:30 ` [PATCH 3/5] completion: mark bash " Johannes Schindelin
2017-05-02 12:30 ` [PATCH 4/5] Fix the remaining tests that failed with core.autocrlf=true Johannes Schindelin
2017-05-02 12:30 ` [PATCH 5/5] t4051: mark supporting files as requiring LF-only line endings Johannes Schindelin
2017-05-02 21:56 ` [PATCH 0/5] Abide by our own rules regarding " Jonathan Nieder
2017-05-03 14:23 ` Johannes Schindelin
2017-05-04 5:19 ` Junio C Hamano
2017-05-04 9:47 ` Johannes Schindelin
2017-05-04 15:04 ` Junio C Hamano
2017-05-04 18:48 ` Johannes Schindelin
2017-05-07 5:29 ` Junio C Hamano
2017-05-08 10:49 ` Johannes Schindelin
2017-05-04 9:49 ` [PATCH v2 0/7] " Johannes Schindelin
2017-05-04 9:49 ` [PATCH v2 1/7] Fix build with core.autocrlf=true Johannes Schindelin
2017-05-08 5:08 ` Junio C Hamano
2017-05-04 9:49 ` [PATCH v2 2/7] git-new-workdir: mark script as LF-only Johannes Schindelin
2017-05-08 5:11 ` Junio C Hamano
2017-05-04 9:49 ` [PATCH v2 3/7] completion: mark bash " Johannes Schindelin
2017-05-04 9:49 ` [PATCH v2 4/7] t3901: move supporting files into t/t3901/ Johannes Schindelin
2017-05-08 5:12 ` Junio C Hamano
2017-05-04 9:50 ` [PATCH v2 5/7] t4003, t4005, t4007 & t4008: handle CR/LF in t/README & t/diff-lib/README Johannes Schindelin
2017-05-08 5:14 ` Junio C Hamano
2017-05-04 9:50 ` [PATCH v2 6/7] Fix the remaining tests that failed with core.autocrlf=true Johannes Schindelin
2017-05-08 5:22 ` Junio C Hamano
2017-05-04 9:50 ` [PATCH v2 7/7] t4051: mark supporting files as requiring LF-only line endings Johannes Schindelin
2017-05-08 5:29 ` Junio C Hamano
2017-05-09 11:20 ` Johannes Schindelin
2017-05-09 12:53 ` [PATCH v3 0/6] Abide by our own rules regarding " Johannes Schindelin
2017-05-09 12:53 ` [PATCH v3 1/6] Fix build with core.autocrlf=true Johannes Schindelin
2017-05-22 17:57 ` Jonathan Nieder
2017-05-23 3:35 ` Junio C Hamano [this message]
2017-05-23 9:01 ` Johannes Schindelin
2017-05-09 12:53 ` [PATCH v3 2/6] git-new-workdir: mark script as LF-only Johannes Schindelin
2017-05-09 12:54 ` [PATCH v3 3/6] completion: mark bash " Johannes Schindelin
2017-05-09 12:54 ` [PATCH v3 4/6] t3901: move supporting files into t/t3901/ Johannes Schindelin
2017-05-09 12:54 ` [PATCH v3 5/6] Fix the remaining tests that failed with core.autocrlf=true Johannes Schindelin
2017-05-09 12:54 ` [PATCH v3 6/6] t4051: mark supporting files as requiring LF-only line endings Johannes Schindelin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqh90cmei6.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jeffhost@microsoft.com \
--cc=johannes.schindelin@gmx.de \
--cc=jrnieder@gmail.com \
--cc=patthoyts@users.sourceforge.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).