From 62b4698e551c29b3d2539a764ad0e93cfff53c03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20N=C4=9Bmec?= Date: Fri, 8 Oct 2010 19:31:15 +0200 Subject: Use angles for placeholders consistently MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Štěpán Němec Acked-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/git-archive.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation/git-archive.txt') diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt index 8d3e66626f..4163a1bcb1 100644 --- a/Documentation/git-archive.txt +++ b/Documentation/git-archive.txt @@ -12,7 +12,7 @@ SYNOPSIS 'git archive' [--format=] [--list] [--prefix=/] [] [-o | --output=] [--worktree-attributes] [--remote= [--exec=]] - [path...] + [...] DESCRIPTION ----------- @@ -73,7 +73,7 @@ OPTIONS :: The tree or commit to produce an archive for. -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. -- cgit v1.2.3 From fc7642a096b99295a636ebde03e4b951a7da9c5a Mon Sep 17 00:00:00 2001 From: Thomas Rast Date: Mon, 10 Jan 2011 13:57:43 +0100 Subject: Documentation/git-archive: spell --worktree-attributes correctly 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 Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano --- Documentation/git-archive.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-archive.txt') 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. -- cgit v1.2.3 From 48bb914ed641fc0880d86b16cbb17c84769c320a Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 11 Mar 2011 00:52:08 -0500 Subject: doc: drop author/documentation sections from most pages The point of these sections is generally to: 1. Give credit where it is due. 2. Give the reader an idea of where to ask questions or file bug reports. But they don't do a good job of either case. For (1), they are out of date and incomplete. A much more accurate answer can be gotten through shortlog or blame. For (2), the correct contact point is generally git@vger, and even if you wanted to cc the contact point, the out-of-date and incomplete fields mean you're likely sending to somebody useless. So let's drop the fields entirely from all manpages except git(1) itself. We already point people to the mailing list for bug reports there, and we can update the Authors section to give credit to the major contributors and point to shortlog and blame for more information. Each page has a "This is part of git" footer, so people can follow that to the main git manpage. --- Documentation/git-archive.txt | 8 -------- 1 file changed, 8 deletions(-) (limited to 'Documentation/git-archive.txt') diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt index bf5037ab2a..f2b8684596 100644 --- a/Documentation/git-archive.txt +++ b/Documentation/git-archive.txt @@ -153,14 +153,6 @@ SEE ALSO -------- linkgit:gitattributes[5] -Author ------- -Written by Franck Bui-Huu and Rene Scharfe. - -Documentation --------------- -Documentation by David Greaves, Junio C Hamano and the git-list . - GIT --- Part of the linkgit:git[1] suite -- cgit v1.2.3 From 810cae53e0f622d6804f063c04a83dbc3a11b7ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scharfe?= Date: Thu, 14 Apr 2011 20:04:57 +0200 Subject: archive: document limitation of tar.umask config setting The local value of the config variable tar.umask is not passed to the other side with --remote. We may want to change that, but for now just document this fact. Reported-by: Jacek Masiulaniec Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- Documentation/git-archive.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Documentation/git-archive.txt') diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt index bf5037ab2a..66943fdf83 100644 --- a/Documentation/git-archive.txt +++ b/Documentation/git-archive.txt @@ -98,7 +98,8 @@ tar.umask:: tar archive entries. The default is 0002, which turns off the world write bit. The special value "user" indicates that the archiving user's umask will be used instead. See umask(2) for - details. + details. If `--remote` is used then only the configuration of + the remote repository takes effect. ATTRIBUTES ---------- -- cgit v1.2.3