diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-11-12 20:13:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-12 20:13:12 (GMT) |
| commit | 7fa1365c54c28b3cd9375539f381b54061a1880d (patch) | |
| tree | a491c1b8644aac729fff4a42a2dfdd3750b81802 /Documentation | |
| parent | caea1a2bb52262c64fdef545578ee7c5ceb113c5 (diff) | |
| parent | 03af7cd1580b7a4d9b77c81081d6eabc0338883e (diff) | |
| download | git-7fa1365c54c28b3cd9375539f381b54061a1880d.zip git-7fa1365c54c28b3cd9375539f381b54061a1880d.tar.gz git-7fa1365c54c28b3cd9375539f381b54061a1880d.tar.bz2 | |
Merge branch 'nd/gitignore-trailing-whitespace' into maint
* nd/gitignore-trailing-whitespace:
gitignore.txt: fix spelling of "backslash"
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/gitignore.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt index 8734c15..09e82c3 100644 --- a/Documentation/gitignore.txt +++ b/Documentation/gitignore.txt @@ -77,7 +77,7 @@ PATTERN FORMAT Put a backslash ("`\`") in front of the first hash for patterns that begin with a hash. - - Trailing spaces are ignored unless they are quoted with backlash + - Trailing spaces are ignored unless they are quoted with backslash ("`\`"). - An optional prefix "`!`" which negates the pattern; any |