summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-01-10 10:39:18 -0800
committerJunio C Hamano <gitster@pobox.com>2011-01-10 10:39:18 -0800
commit7a876edf5d5224e0755cfabb808b042f300e293d (patch)
tree66921050c562f00200bd13c014356edcd086be3d /Documentation
parentb91779f17eb19ffc2e63e84728e785cf274b47df (diff)
parent567323d387dda559dbdba8c15453aba629393955 (diff)
downloadgit-7a876edf5d5224e0755cfabb808b042f300e293d.tar.gz
Merge branch 'maint-1.7.1' into maint-1.7.2
* maint-1.7.1: Documentation/githooks: post-rewrite-copy-notes never existed Documentation/git-archive: spell --worktree-attributes correctly
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-archive.txt2
-rw-r--r--Documentation/githooks.txt4
2 files changed, 1 insertions, 5 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.
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index 7183aa9abb..28edefa202 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -350,10 +350,6 @@ rebase::
The commits are guaranteed to be listed in the order that they were
processed by rebase.
-There is no default 'post-rewrite' hook, but see the
-`post-receive-copy-notes` script in `contrib/hooks` for an example
-that copies your git-notes to the rewritten commits.
-
GIT
---