diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-01 03:52:53 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-01 03:52:53 +0400 |
| commit | 7f314565fe20e324e8db1a7c233e43ca4e3683f0 (patch) | |
| tree | e548496395a012f6ff7072bb4fb8f5d772a9f07d /Documentation/gitattributes.txt | |
| parent | 7df437e56b5a2c5ec7140dd097b517563db4972c (diff) | |
| parent | 14877436871a1e5e38deb64abb884b480ff02567 (diff) | |
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.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 1f23d27a61..5fb5007413 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 |