Code

Documentation: clarify use of .git{ignore,attributes} versus .git/info/*
authorJeff King <peff@peff.net>
Thu, 27 Mar 2008 05:31:00 +0000 (01:31 -0400)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Mar 2008 20:03:51 +0000 (13:03 -0700)
commit90b22907f2d1e0b41d7ac5c281ed20e7c8a27c66
treebf3e89ab68e3fb7c55699349ace4ca0c550c96b0
parent525d461528880c3ef1d466017b4cbbb0093dd7a5
Documentation: clarify use of .git{ignore,attributes} versus .git/info/*

gitignore patterns can be read from three different
files, while gitattributes can come from two files. Let's
provide some hints to the user about the differences and how
they are typically used.

Suggested by Toby Corkindale, but gratuitously reworded by Jeff King.

Signed-off-by: Toby Corkindale <toby.corkindale@rea-group.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/gitattributes.txt
Documentation/gitignore.txt