diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-12 04:41:48 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-12 04:41:48 +0400 |
| commit | e2af9e361b1d7452492baa073790b19292f9c038 (patch) | |
| tree | e717ab3c92aecf5c4c06627daef025506d2c6335 /Documentation | |
| parent | 7ece7ee6079682bb2bb968b61a62fcb233df4005 (diff) | |
| parent | 3a51467b94306e77c1b69b374bac33b6672bc177 (diff) | |
Merge branch 'maint'
* maint:
Typo fix: replacing it's -> its
t: make PIPE a standard test prerequisite
archive: clarify explanation of --worktree-attributes
t/README: --immediate skips cleanup commands for failed tests
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-archive.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt index b4c2e24849..250e5228a3 100644 --- a/Documentation/git-archive.txt +++ b/Documentation/git-archive.txt @@ -56,7 +56,8 @@ OPTIONS Write the archive to <file> instead of stdout. --worktree-attributes:: - Look for attributes in .gitattributes in working directory too. + Look for attributes in .gitattributes files in the working tree + as well (see <<ATTRIBUTES>>). <extra>:: This can be any options that the archiver backend understands. @@ -120,6 +121,7 @@ tar.<format>.remote:: user-defined formats, but true for the "tar.gz" and "tgz" formats. +[[ATTRIBUTES]] ATTRIBUTES ---------- |