diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-04-18 14:46:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-18 14:46:08 -0700 |
| commit | 5758b25da43c401cad33f3304f78084a0305d21c (patch) | |
| tree | e10e86da5fd7b1c0f13306e289a065bae336e38e /Documentation | |
| parent | Merge branch 'maint' (diff) | |
| parent | archive test: attributes (diff) | |
| download | tgif-5758b25da43c401cad33f3304f78084a0305d21c.tar.xz | |
Merge branch 'nd/archive-attribute'
* nd/archive-attribute:
archive test: attributes
archive: do not read .gitattributes in working directory
unpack-trees: do not muck with attributes when we are not checking out
attr: add GIT_ATTR_INDEX "direction"
archive tests: do not use .gitattributes in working directory
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-archive.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt index c1adf59497..bc132c87e1 100644 --- a/Documentation/git-archive.txt +++ b/Documentation/git-archive.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git archive' --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>] - [--output=<file>] + [--output=<file>] [--worktree-attributes] [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish> [path...] @@ -51,6 +51,9 @@ OPTIONS --output=<file>:: Write the archive to <file> instead of stdout. +--worktree-attributes:: + Look for attributes in .gitattributes in working directory too. + <extra>:: This can be any options that the archiver backend understands. See next section. |