diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-01-10 10:39:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-01-10 10:39:38 -0800 |
| commit | a6fd3d4925ca3629e7edc73a60f5e1c50c1d5390 (patch) | |
| tree | ece40071cafd0fded57d4e2ad610a165ef5209ec | |
| parent | 2cf08b6a0ab09f1b81b78a5686a632a2a602abf4 (diff) | |
| parent | 54f4cd9e8c7992f70d16efac3c6fc0a18ac0b156 (diff) | |
| download | git-a6fd3d4925ca3629e7edc73a60f5e1c50c1d5390.tar.gz | |
Merge branch 'maint'
* maint:
Documentation/githooks: post-rewrite-copy-notes never existed
Documentation/git-archive: spell --worktree-attributes correctly
| -rw-r--r-- | Documentation/git-archive.txt | 2 | ||||
| -rw-r--r-- | Documentation/githooks.txt | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt index 4163a1bcb1..bf5037ab2a 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 --- |