From: Junio C Hamano <gitster@pobox.com>
To: Jakub Narebski <jnareb@gmail.com>
Cc: Christian Holtje <docwhat@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH] pre-commit hook should ignore carriage returns at EOL
Date: Tue, 24 Jun 2008 16:39:46 -0700 [thread overview]
Message-ID: <7vbq1q9zct.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <m3k5gejtkp.fsf@localhost.localdomain> (Jakub Narebski's message of "Tue, 24 Jun 2008 16:34:35 -0700 (PDT)")
Jakub Narebski <jnareb@gmail.com> writes:
> Christian Holtje <docwhat@gmail.com> writes:
>
>> Based on the information about core.whitespace doesn't git do this
>> already? Maybe we should just delete the pre-commit hook or make it
>> empty with a note saying what you can do with it?
>
> pre-commit hook also detects unresolved merge conflicts, which
> core.whitespace doesn't (and probably shouldn't).
But perhaps "diff --check" should.
next prev parent reply other threads:[~2008-06-24 23:40 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-24 16:23 [PATCH] pre-commit hook should ignore carriage returns at EOL Christian Holtje
2008-06-24 18:22 ` Alf Clement
2008-06-24 18:26 ` Ian Hilt
2008-06-24 19:05 ` Jakub Narebski
2008-06-24 19:54 ` Ian Hilt
2008-06-24 20:09 ` Jakub Narebski
2008-06-24 20:36 ` Ian Hilt
2008-06-24 19:16 ` Christian Holtje
2008-06-24 22:31 ` Junio C Hamano
2008-06-24 23:25 ` Christian Holtje
2008-06-24 23:34 ` Jakub Narebski
2008-06-24 23:39 ` Junio C Hamano [this message]
2008-06-25 0:19 ` Christian Holtje
2008-06-24 23:59 ` Junio C Hamano
2008-06-25 2:09 ` [PATCH] Ship sample hooks with .sample suffix Junio C Hamano
2008-06-25 2:48 ` Junio C Hamano
2008-06-25 6:51 ` Johannes Sixt
2008-06-25 8:09 ` Junio C Hamano
2008-06-26 7:19 ` Johannes Sixt
2008-06-26 7:28 ` Junio C Hamano
2008-06-25 5:18 ` Peter Baumann
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=7vbq1q9zct.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=docwhat@gmail.com \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.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).