From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Jan 2011 18:39:28 +0000 (-0800)
Subject: Merge branch 'maint-1.7.2' into maint
X-Git-Tag: v1.7.4-rc2~13^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/54f4cd9e8c7992f70d16efac3c6fc0a18ac0b156?ds=inline;hp=-c

Merge branch 'maint-1.7.2' into maint

* maint-1.7.2:
Documentation/githooks: post-rewrite-copy-notes never existed
Documentation/git-archive: spell --worktree-attributes correctly
---

54f4cd9e8c7992f70d16efac3c6fc0a18ac0b156
diff --combined Documentation/git-archive.txt
index 4163a1bcb1,bc0eaef298..bf5037ab2a
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@@ -12,7 -12,7 +12,7 @@@ SYNOPSI
  'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]
  	      [-o | --output=<file>] [--worktree-attributes]
  	      [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
 -	      [path...]
 +	      [<path>...]
  
  DESCRIPTION
  -----------
@@@ -73,7 -73,7 +73,7 @@@ OPTION
  <tree-ish>::
  	The tree or commit to produce an archive for.
  
 -path::
 +<path>::
  	Without an optional path parameter, all files and subdirectories
  	of the current working directory are included in the archive.
  	If one or more paths are specified, only these are included.
@@@ -116,7 -116,7 +116,7 @@@ Note that attributes are by default tak
  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.