summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-31 23:52:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-08-31 23:52:53 (GMT)
commit7f314565fe20e324e8db1a7c233e43ca4e3683f0 (patch)
treee548496395a012f6ff7072bb4fb8f5d772a9f07d /Documentation/gitattributes.txt
parent7df437e56b5a2c5ec7140dd097b517563db4972c (diff)
parent14877436871a1e5e38deb64abb884b480ff02567 (diff)
downloadgit-7f314565fe20e324e8db1a7c233e43ca4e3683f0.zip
git-7f314565fe20e324e8db1a7c233e43ca4e3683f0.tar.gz
git-7f314565fe20e324e8db1a7c233e43ca4e3683f0.tar.bz2
Merge branch 'maint'
* maint: Document sendemail.envelopesender configuration Document clarification: gitmodules, gitattributes config.txt: Add missing colons after option name
Diffstat (limited to 'Documentation/gitattributes.txt')
-rw-r--r--Documentation/gitattributes.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 1f23d27..5fb5007 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -7,7 +7,7 @@ gitattributes - defining attributes per path
SYNOPSIS
--------
-$GIT_DIR/info/attributes, gitattributes
+$GIT_DIR/info/attributes, .gitattributes
DESCRIPTION