From 708376e8576f6d39b62b27ee9dfe7292c652f728 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 19 Jul 2011 20:02:13 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.7.6-233-gd79bc --- RelNotes/1.7.7.txt | 51 +++++++++++++++++++++++++++++++++++++++++++++++-- git-archive.html | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++- git-archive.txt | 33 ++++++++++++++++++++++++++++++++ git-clone.html | 20 ++++++++++++++++++- git-clone.txt | 11 +++++++++++ git-submodule.html | 6 ++++-- git-submodule.txt | 4 +++- git-tag.html | 11 +++++++---- git-tag.txt | 9 ++++++--- 9 files changed, 187 insertions(+), 14 deletions(-) diff --git a/RelNotes/1.7.7.txt b/RelNotes/1.7.7.txt index c5a5441743..42982e5b24 100644 --- a/RelNotes/1.7.7.txt +++ b/RelNotes/1.7.7.txt @@ -6,12 +6,22 @@ Updates since v1.7.6 * The scripting part of the codebase is getting prepared for i18n/l10n. + * Interix and Cygwin ports got updated. + + * Various codepaths that invoked zlib deflate/inflate assumed that these + functions can compress or uncompress more than 4GB data in one call on + platforms with 64-bit long, which has been corrected. + + * "git archive" can be told to pass the output to gzip compression and + produce "archive.tar.gz". + * "git checkout" (both the code to update the files upon checking out a different branch, the code to checkout specific set of files) learned to stream the data from object store when possible, without having to read the entire contents of a file in memory first. - * "git diff --cc" learned to correctly ignore binary files. + * "git clone" can now take "--config key=value" option to set the + repository configuration options that affect the initial checkout. * "git diff --stat" learned --stat-count option to limit the output of diffstat report. @@ -19,6 +29,19 @@ Updates since v1.7.6 * "git grep" learned --break and --heading options, to let users mimic output format of "ack". + * "git rebase master topci" no longer spews usage hints after giving + "fatal: no such branch: topci" error message. + + * "git submodule update" used to stop at the first error updating a + submodule; it now goes on to update other submodules that can be + updated, and reports the ones with errors at the end. + + * "git verify-pack" has been rewritten to use the "index-pack" machinery + that is more efficient in reading objects in packfiles. + + * test scripts for gitweb tried to run even when CGI-related perl modules + are not installed; it now exits early when they are unavailable. + Also contains various documentation updates and minor miscellaneous changes. @@ -29,8 +52,32 @@ Fixes since v1.7.6 Unless otherwise noted, all the fixes in 1.7.6.X maintenance track are included in this release. + * "git diff --cc" learned to correctly ignore binary files. + (merge 0508fe5 jk/combine-diff-binary-etc later) + + * "git fetch" did not recurse into submodules in subdirectories. + (merge ea2d325 jl/maint-fetch-recursive-fix later) + + * "git rebase -i -p" incorrectly dropped commits from side branches. + (merge 12bf828 aw/rebase-i-p later) + + * "git submodule foreach" failed to correctly give the standard input to + the user-supplied command it invoked. + (merge 4dca1aa bc/submodule-foreach-stdin-fix-1.7.4 later) + + * submodules that the user has never showed interest in by running + "git submodule init" was incorrectly marked as interesting by "git + submodule sync". + (merge 2cd9de3 jc/submodule-sync-no-auto-vivify later) + + * "git tag -l ..." did not take multiple glob patterns from the + command line. + (merge 588d0e8 jk/tag-list-multiple-patterns later) + -- exec >/var/tmp/1 echo O=$(git describe master) -O=v1.7.6-133-g395f65d +O=v1.7.6-232-gd907bf8 +git log --first-parent --oneline $O..master +echo git shortlog --no-merges ^maint ^$O master diff --git a/git-archive.html b/git-archive.html index bae0e4ed5c..3168d76757 100644 --- a/git-archive.html +++ b/git-archive.html @@ -587,6 +587,34 @@ tar.umask the remote repository takes effect.

+
+tar.<format>.command +
+
+

+ This variable specifies a shell command through which the tar + output generated by git archive should be piped. The command + is executed using the shell with the generated tar file on its + standard input, and should produce the final output on its + standard output. Any compression-level options will be passed + to the command (e.g., "-9"). An output file with the same + extension as <format> will be use this format if no other + format is given. +

+

The "tar.gz" and "tgz" formats are defined automatically and default to +gzip -cn. You may override them with custom commands.

+
+
+tar.<format>.remote +
+
+

+ If true, enable <format> for use by remote clients via + git-upload-archive(1). Defaults to false for + user-defined formats, but true for the "tar.gz" and "tgz" + formats. +

+

ATTRIBUTES

@@ -642,6 +670,22 @@ git archive --format=tar --prefix=git-1.4.0/ v1.4.0 | gzip >git-1.4.0.tar.gz

+git archive --format=tar.gz --prefix=git-1.4.0/ v1.4.0 >git-1.4.0.tar.gz +
+
+

+ Same as above, but using the builtin tar.gz handling. +

+
+
+git archive --prefix=git-1.4.0/ -o git-1.4.0.tar.gz v1.4.0 +
+
+

+ Same as above, but the format is inferred from the output file. +

+
+
git archive --format=tar --prefix=git-1.4.0/ v1.4.0^{tree} | gzip >git-1.4.0.tar.gz
@@ -669,6 +713,16 @@ git archive -o latest.zip HEAD inferred by the extension of the output file.

+
+git config tar.tar.xz.command "xz -c" +
+
+

+ Configure a "tar.xz" format for making LZMA-compressed tarfiles. + You can use it specifying --format=tar.xz, or by creating an + output file like -o foo.tar.xz. +

+

SEE ALSO

@@ -681,7 +735,7 @@ git archive -o latest.zip HEAD diff --git a/git-archive.txt b/git-archive.txt index 9c750e2444..1320c873ad 100644 --- a/git-archive.txt +++ b/git-archive.txt @@ -101,6 +101,25 @@ tar.umask:: details. If `--remote` is used then only the configuration of the remote repository takes effect. +tar..command:: + This variable specifies a shell command through which the tar + output generated by `git archive` should be piped. The command + is executed using the shell with the generated tar file on its + standard input, and should produce the final output on its + standard output. Any compression-level options will be passed + to the command (e.g., "-9"). An output file with the same + extension as `` will be use this format if no other + format is given. ++ +The "tar.gz" and "tgz" formats are defined automatically and default to +`gzip -cn`. You may override them with custom commands. + +tar..remote:: + If true, enable `` for use by remote clients via + linkgit:git-upload-archive[1]. Defaults to false for + user-defined formats, but true for the "tar.gz" and "tgz" + formats. + ATTRIBUTES ---------- @@ -133,6 +152,14 @@ git archive --format=tar --prefix=git-1.4.0/ v1.4.0 | gzip >git-1.4.0.tar.gz:: Create a compressed tarball for v1.4.0 release. +git archive --format=tar.gz --prefix=git-1.4.0/ v1.4.0 >git-1.4.0.tar.gz:: + + Same as above, but using the builtin tar.gz handling. + +git archive --prefix=git-1.4.0/ -o git-1.4.0.tar.gz v1.4.0:: + + Same as above, but the format is inferred from the output file. + git archive --format=tar --prefix=git-1.4.0/ v1.4.0{caret}\{tree\} | gzip >git-1.4.0.tar.gz:: Create a compressed tarball for v1.4.0 release, but without a @@ -149,6 +176,12 @@ git archive -o latest.zip HEAD:: commit on the current branch. Note that the output format is inferred by the extension of the output file. +git config tar.tar.xz.command "xz -c":: + + Configure a "tar.xz" format for making LZMA-compressed tarfiles. + You can use it specifying `--format=tar.xz`, or by creating an + output file like `-o foo.tar.xz`. + SEE ALSO -------- diff --git a/git-clone.html b/git-clone.html index 7b5a8427c8..db85d92cc4 100644 --- a/git-clone.html +++ b/git-clone.html @@ -647,6 +647,24 @@ objects from the source repository into a pack in the cloned repository.

+--config <key>=<value> +
+
+-c <key>=<value> +
+
+

+ Set a configuration variable in the newly-created repository; + this takes effect immediately after the repository is + initialized, but before the remote history is fetched or any + files checked out. The key is in the same format as expected by + git-config(1) (e.g., core.eol=true). If multiple + values are given for the same key, each value will be written to + the config file. This makes it safe, for example, to add + additional fetch refspecs to the origin remote. +

+
+
--depth <depth>
@@ -902,7 +920,7 @@ Create a repository on the kernel.org machine that borrows from Linus: diff --git a/git-clone.txt b/git-clone.txt index b093e45497..4b8b26b75e 100644 --- a/git-clone.txt +++ b/git-clone.txt @@ -159,6 +159,17 @@ objects from the source repository into a pack in the cloned repository. Specify the directory from which templates will be used; (See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].) +--config =:: +-c =:: + Set a configuration variable in the newly-created repository; + this takes effect immediately after the repository is + initialized, but before the remote history is fetched or any + files checked out. The key is in the same format as expected by + linkgit:git-config[1] (e.g., `core.eol=true`). If multiple + values are given for the same key, each value will be written to + the config file. This makes it safe, for example, to add + additional fetch refspecs to the origin remote. + --depth :: Create a 'shallow' clone with a history truncated to the specified number of revisions. A shallow repository has a diff --git a/git-submodule.html b/git-submodule.html index c4f4350698..dc09fb287d 100644 --- a/git-submodule.html +++ b/git-submodule.html @@ -597,7 +597,9 @@ sync

Synchronizes submodules' remote URL configuration setting - to the value specified in .gitmodules. This is useful when + to the value specified in .gitmodules. It will only affect those + submodules which already have an url entry in .git/config (that is the + case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly.

@@ -770,7 +772,7 @@ for details.

diff --git a/git-submodule.txt b/git-submodule.txt index 12af4de5e1..acb9002fe4 100644 --- a/git-submodule.txt +++ b/git-submodule.txt @@ -167,7 +167,9 @@ commit for each submodule. sync:: Synchronizes submodules' remote URL configuration setting - to the value specified in .gitmodules. This is useful when + to the value specified in .gitmodules. It will only affect those + submodules which already have an url entry in .git/config (that is the + case when they are initialized or freshly added). This is useful when submodule URLs change upstream and you need to update your local repositories accordingly. + diff --git a/git-tag.html b/git-tag.html index a2663f6056..4717ec7e6b 100644 --- a/git-tag.html +++ b/git-tag.html @@ -418,7 +418,7 @@ git-tag(1) Manual Page
git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> [<commit> | <object>] git tag -d <tagname>… -git tag [-n[<num>]] -l [--contains <commit>] [<pattern>] +git tag [-n[<num>]] -l [--contains <commit>] [<pattern>…] git tag -v <tagname>…
@@ -513,8 +513,11 @@ GnuPG key for signing.

- List tags with names that match the given pattern (or all if no pattern is given). - Typing "git tag" without arguments, also lists all tags. + List tags with names that match the given pattern (or all if no + pattern is given). Running "git tag" without arguments also + lists all tags. The pattern is a shell wildcard (i.e., matched + using fnmatch(3)). Multiple patterns may be given; if any of + them matches, the tag is shown.

@@ -761,7 +764,7 @@ ISO 8601 diff --git a/git-tag.txt b/git-tag.txt index d82f62120a..fb1c0ac694 100644 --- a/git-tag.txt +++ b/git-tag.txt @@ -12,7 +12,7 @@ SYNOPSIS 'git tag' [-a | -s | -u ] [-f] [-m | -F ] [ | ] 'git tag' -d ... -'git tag' [-n[]] -l [--contains ] [] +'git tag' [-n[]] -l [--contains ] [...] 'git tag' -v ... DESCRIPTION @@ -69,8 +69,11 @@ OPTIONS If the tag is not annotated, the commit message is displayed instead. -l :: - List tags with names that match the given pattern (or all if no pattern is given). - Typing "git tag" without arguments, also lists all tags. + List tags with names that match the given pattern (or all if no + pattern is given). Running "git tag" without arguments also + lists all tags. The pattern is a shell wildcard (i.e., matched + using fnmatch(3)). Multiple patterns may be given; if any of + them matches, the tag is shown. --contains :: Only list tags which contain the specified commit. -- 2.11.4.GIT