summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cb198b3)
raw | patch | inline | side by side (parent: cb198b3)
author | Thomas Rast <trast@student.ethz.ch> | |
Mon, 10 Jan 2011 12:57:43 +0000 (13:57 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 10 Jan 2011 17:07:24 +0000 (09:07 -0800) |
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>
(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>
Documentation/git-archive.txt | patch | blob | history |
index 8d3e66626f7561b0ba7f8140288cfc15167bdc14..bc0eaef298a45e132be791b4579ba982d636ae75 100644 (file)
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.