Merge branch 'maint-1.7.0' into maint-1.7.1
* maint-1.7.0: Documentation/git-archive: spell --worktree-attributes correctly
This commit is contained in:
commit
567323d387
@ -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.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user