diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2011-01-10 13:57:43 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-01-10 09:07:24 -0800 |
| commit | fc7642a096b99295a636ebde03e4b951a7da9c5a (patch) | |
| tree | 234acfb391182a496c41da90b38e297d38fb83d6 | |
| parent | cb198b3b67feb2c0a6f22199ec14fa48d18ac1ce (diff) | |
| download | git-fc7642a096b99295a636ebde03e4b951a7da9c5a.tar.gz git-fc7642a096b99295a636ebde03e4b951a7da9c5a.tar.xz | |
Documentation/git-archive: spell --worktree-attributes correctly
The --worktree-attributes option was correctly documented in ba053ea
(archive: do not read .gitattributes in working directory,
2009-04-18). However, later in 9b4c8b0 (archive documentation:
attributes are taken from the tree by default, 2010-02-10) the
misspelling "--work-tree-attributes" was used to refer to it. Fix
this.
Noticed-by: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 8d3e66626..bc0eaef29 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. |