diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-01-10 10:39:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-01-10 10:39:04 -0800 |
| commit | 567323d387dda559dbdba8c15453aba629393955 (patch) | |
| tree | 176085ab5fc95105a53a6bb631e1a0aeecf9da9a /Documentation | |
| parent | Documentation/githooks: post-rewrite-copy-notes never existed (diff) | |
| parent | Documentation/git-archive: spell --worktree-attributes correctly (diff) | |
| download | tgif-567323d387dda559dbdba8c15453aba629393955.tar.xz | |
Merge branch 'maint-1.7.0' into maint-1.7.1
* maint-1.7.0:
Documentation/git-archive: spell --worktree-attributes correctly
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-archive.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt index 8d3e66626f..bc0eaef298 100644 --- a/Documentation/git-archive.txt +++ b/Documentation/git-archive.txt @@ -116,7 +116,7 @@ Note that attributes are by default taken from the `.gitattributes` files in the tree that is being archived. If you want to tweak the way the output is generated after the fact (e.g. you committed without adding an appropriate export-ignore in its `.gitattributes`), adjust the checked out -`.gitattributes` file as necessary and use `--work-tree-attributes` +`.gitattributes` file as necessary and use `--worktree-attributes` option. Alternatively you can keep necessary attributes that should apply while archiving any tree in your `$GIT_DIR/info/attributes` file. |