From: Jakub Narebski Date: Tue, 24 Jun 2008 23:34:35 GMT Subject: Re: [PATCH] pre-commit hook should ignore carriage returns at EOL Message-ID: In-Reply-To: <930163B6-4A7E-49C7-B9D5-F7B37699C2A9@gmail.com> Christian Holtje 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). -- Jakub Narebski Poland ShadeHawk on #git