From cb1c44f98ce06a76975f2d1fcb62a33188cefafb Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 6 Aug 2008 06:19:33 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.6.0-rc1-90-gddd6 --- RelNotes-1.5.2.txt | 2 +- RelNotes-1.5.3.txt | 6 +- RelNotes-1.5.4.4.txt | 2 +- RelNotes-1.5.4.5.txt | 2 +- RelNotes-1.5.6.5.txt | 13 +++++ RelNotes-1.6.0.txt | 2 +- config.txt | 2 +- git-cat-file.html | 126 +++++++++++++++++++++++++++++------------- git-cat-file.txt | 2 +- git-config.html | 8 +-- git-for-each-ref.html | 4 +- git-for-each-ref.txt | 2 +- git-merge.html | 6 +- git-mergetool.html | 4 +- git-mergetool.txt | 2 +- git-svn.html | 6 +- git-svn.txt | 4 +- merge-config.txt | 4 +- 18 files changed, 129 insertions(+), 68 deletions(-) diff --git a/RelNotes-1.5.2.txt b/RelNotes-1.5.2.txt index 6195715dc..e8328d090 100644 --- a/RelNotes-1.5.2.txt +++ b/RelNotes-1.5.2.txt @@ -36,7 +36,7 @@ Updates since v1.5.1 expansion). These conversions apply when checking files in or out, and exporting via git-archive. -* The packfile format now optionally suports 64-bit index. +* The packfile format now optionally supports 64-bit index. This release supports the "version 2" format of the .idx file. This is automatically enabled when a huge packfile diff --git a/RelNotes-1.5.3.txt b/RelNotes-1.5.3.txt index d03894b92..0668d3c0c 100644 --- a/RelNotes-1.5.3.txt +++ b/RelNotes-1.5.3.txt @@ -86,7 +86,7 @@ Updates since v1.5.2 - "git rev-list" learned --regexp-ignore-case and --extended-regexp options to tweak its matching logic used - for --grep fitering. + for --grep filtering. - "git describe --contains" is a handier way to call more obscure command "git name-rev --tags". @@ -243,7 +243,7 @@ Updates since v1.5.2 - We used to have core.legacyheaders configuration, when set to false, allowed git to write loose objects in a format - that mimicks the format used by objects stored in packs. It + that mimics the format used by objects stored in packs. It turns out that this was not so useful. Although we will continue to read objects written in that format, we do not honor that configuration anymore and create loose objects in @@ -302,7 +302,7 @@ Updates since v1.5.2 small enough delta results it creates while looking for the best delta candidates. - - "git pack-objects" learned a new heuristcs to prefer delta + - "git pack-objects" learned a new heuristic to prefer delta that is shallower in depth over the smallest delta possible. This improves both overall packfile access performance and packfile density. diff --git a/RelNotes-1.5.4.4.txt b/RelNotes-1.5.4.4.txt index 89fa6d03b..323c1a88c 100644 --- a/RelNotes-1.5.4.4.txt +++ b/RelNotes-1.5.4.4.txt @@ -55,7 +55,7 @@ Fixes since v1.5.4.3 * "git log --merge" did not work well with --left-right option. - * "git svn" promprted for client cert password every time it accessed the + * "git svn" prompted for client cert password every time it accessed the server. * The reset command in "git fast-import" data stream was documented to diff --git a/RelNotes-1.5.4.5.txt b/RelNotes-1.5.4.5.txt index 028234139..bbd130e36 100644 --- a/RelNotes-1.5.4.5.txt +++ b/RelNotes-1.5.4.5.txt @@ -9,7 +9,7 @@ Fixes since v1.5.4.4 1.5.4). * Bogus refspec configuration such as "remote.there.fetch = =" were not - detected as errors (regressionin 1.5.4). + detected as errors (regression in 1.5.4). * You couldn't specify a custom editor whose path contains a whitespace via GIT_EDITOR (and core.editor). diff --git a/RelNotes-1.5.6.5.txt b/RelNotes-1.5.6.5.txt index fc40438b1..23981acf3 100644 --- a/RelNotes-1.5.6.5.txt +++ b/RelNotes-1.5.6.5.txt @@ -4,10 +4,17 @@ GIT v1.5.6.5 Release Notes Fixes since v1.5.6.4 -------------------- +* "git cvsimport" used to spit out "UNKNOWN LINE..." diagnostics to stdout. + * "git init --template=" with blank "template" parameter linked files under root directories to .git, which was a total nonsense. Instead, it means "I do not want to use anything from the template directory". +* "git diff-tree" and other diff plumbing ignored diff.renamelimit configuration + variable when the user explicitly asked for rename detection. + +* "git name-rev --name-only" did not work when "--stdin" option was in effect. + * "git show-branch" mishandled its 8th branch. * Addition of "git update-index --ignore-submodules" that happened during @@ -17,3 +24,9 @@ Fixes since v1.5.6.4 header properly. Contains other various documentation fixes. + +-- +exec >/var/tmp/1 +echo O=$(git describe maint) +O=v1.5.6.4-26-g2b6ca6d +git shortlog --no-merges $O..maint diff --git a/RelNotes-1.6.0.txt b/RelNotes-1.6.0.txt index 2542cf53d..614a3be94 100644 --- a/RelNotes-1.6.0.txt +++ b/RelNotes-1.6.0.txt @@ -187,7 +187,7 @@ Updates since v1.5.6 command internally uses rev-parse to interpret its arguments. * git-rev-list learned --children option to show child commits it - encountered during the traversal, instead of shoing parent commits. + encountered during the traversal, instead of showing parent commits. * git-send-mail can talk not just over SSL but over TLS now. diff --git a/config.txt b/config.txt index 61c376057..b8ec01c92 100644 --- a/config.txt +++ b/config.txt @@ -693,7 +693,7 @@ gitcvs.usecrlfattr files to determine the '-k' modes to use. If `crlf` is set, the '-k' mode will be left blank, so cvs clients will treat it as text. If `crlf` is explicitly unset, the file - will be set with '-kb' mode, which supresses any newline munging + will be set with '-kb' mode, which suppresses any newline munging the client might otherwise do. If `crlf` is not specified, then 'gitcvs.allbinary' is used. See linkgit:gitattributes[5]. diff --git a/git-cat-file.html b/git-cat-file.html index 6e6300843..bda4045fc 100644 --- a/git-cat-file.html +++ b/git-cat-file.html @@ -3,7 +3,7 @@ - + git-cat-file(1) @@ -276,17 +324,17 @@ git-cat-file(1) Manual Page
git cat-file [-t | -s | -e | -p | <type>] <object> git cat-file [--batch | --batch-check] < <list-of-objects>
-

DESCRIPTION

+

DESCRIPTION

-

In the first form, provides content or type of objects in the repository. The +

In the first form, provides content or type of objects in the repository. The type is required unless -t or -p is used to find the object type, or -s -is used to find the object size.

-

In the second form, a list of object (separated by LFs) is provided on stdin, -and the SHA1, type, and size of each object is printed on stdout.

+is used to find the object size.

+

In the second form, a list of object (separated by LFs) is provided on stdin, +and the SHA1, type, and size of each object is printed on stdout.

-

OPTIONS

+

OPTIONS

-
+
<object>
@@ -363,51 +411,51 @@ and the SHA1, type, and size of each object is printed on stdout.

combined with any other options or arguments.

-
+
-

OUTPUT

+

OUTPUT

-

If -t is specified, one of the <type>.

-

If -s is specified, the size of the <object> in bytes.

-

If -e is specified, no output.

-

If -p is specified, the contents of <object> are pretty-printed.

-

If <type> is specified, the raw (though uncompressed) contents of the <object> -will be returned.

-

If --batch is specified, output of the following form is printed for each -object specified on stdin:

+

If -t is specified, one of the <type>.

+

If -s is specified, the size of the <object> in bytes.

+

If -e is specified, no output.

+

If -p is specified, the contents of <object> are pretty-printed.

+

If <type> is specified, the raw (though uncompressed) contents of the <object> +will be returned.

+

If --batch is specified, output of the following form is printed for each +object specified on stdin:

<sha1> SP <type> SP <size> LF
 <contents> LF
-

If --batch-check is specified, output of the following form is printed for -each object specified fon stdin:

+

If --batch-check is specified, output of the following form is printed for +each object specified on stdin:

<sha1> SP <type> SP <size> LF
-

For both --batch and --batch-check, output of the following form is printed -for each object specified on stdin that does not exist in the repository:

+

For both --batch and --batch-check, output of the following form is printed +for each object specified on stdin that does not exist in the repository:

<object> SP missing LF
-

Author

+

Author

-

Written by Linus Torvalds <torvalds@osdl.org>

+

Written by Linus Torvalds <torvalds@osdl.org>

-

Documentation

+

Documentation

-

Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.

+

Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.

-

GIT

+

GIT

-

Part of the git(1) suite

+

Part of the git(1) suite

diff --git a/git-cat-file.txt b/git-cat-file.txt index d35e8a04f..668f697c2 100644 --- a/git-cat-file.txt +++ b/git-cat-file.txt @@ -81,7 +81,7 @@ object specified on stdin: ------------ If '--batch-check' is specified, output of the following form is printed for -each object specified fon stdin: +each object specified on stdin: ------------ SP SP LF diff --git a/git-config.html b/git-config.html index b85ee88ce..b36d75064 100644 --- a/git-config.html +++ b/git-config.html @@ -1779,7 +1779,7 @@ gitcvs.logfile files to determine the -k modes to use. If crlf is set, the -k mode will be left blank, so cvs clients will treat it as text. If crlf is explicitly unset, the file - will be set with -kb mode, which supresses any newline munging + will be set with -kb mode, which suppresses any newline munging the client might otherwise do. If crlf is not specified, then gitcvs.allbinary is used. See gitattributes(5).

@@ -2130,7 +2130,7 @@ merge.stat

- Whether to print the diffstat berween ORIG_HEAD and merge result + Whether to print the diffstat between ORIG_HEAD and merge result at the end of the merge. True by default.

@@ -2162,7 +2162,7 @@ merge.tool git-mergetool(1). Valid built-in values are: "kdiff3", "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff". Any other value is treated is custom merge tool - and there must be a corresponing mergetool.<tool>.cmd option. + and there must be a corresponding mergetool.<tool>.cmd option.

@@ -2700,7 +2700,7 @@ web.browser
diff --git a/git-for-each-ref.html b/git-for-each-ref.html index e029e56ef..a6b14002c 100644 --- a/git-for-each-ref.html +++ b/git-for-each-ref.html @@ -381,7 +381,7 @@ host language allowing their direct evaluation in that language.

If one or more patterns are given, only refs are shown that - match againt at least one pattern, either using fnmatch(3) or + match against at least one pattern, either using fnmatch(3) or literally, in the latter case matching completely or from the beginning up to a slash.

@@ -553,7 +553,7 @@ eval "$eval" diff --git a/git-for-each-ref.txt b/git-for-each-ref.txt index 609f9496b..eae6c0e7b 100644 --- a/git-for-each-ref.txt +++ b/git-for-each-ref.txt @@ -49,7 +49,7 @@ OPTIONS ...:: If one or more patterns are given, only refs are shown that - match againt at least one pattern, either using fnmatch(3) or + match against at least one pattern, either using fnmatch(3) or literally, in the latter case matching completely or from the beginning up to a slash. diff --git a/git-merge.html b/git-merge.html index 3ebfdcafb..a4aceea49 100644 --- a/git-merge.html +++ b/git-merge.html @@ -565,7 +565,7 @@ merge.stat

- Whether to print the diffstat berween ORIG_HEAD and merge result + Whether to print the diffstat between ORIG_HEAD and merge result at the end of the merge. True by default.

@@ -597,7 +597,7 @@ merge.tool git-mergetool(1). Valid built-in values are: "kdiff3", "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff". Any other value is treated is custom merge tool - and there must be a corresponing mergetool.<tool>.cmd option. + and there must be a corresponding mergetool.<tool>.cmd option.

@@ -801,7 +801,7 @@ Resolve the conflicts. git diff would report only the diff --git a/git-mergetool.html b/git-mergetool.html index 0c7b646eb..301e50bb8 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -354,7 +354,7 @@ can configure the absolute path to kdiff3 by setting tool is available in PATH.

Instead of running one of the known merge tool programs git-mergetool can be customized to run an alternative program -by specifying the command line to invoke in a configration +by specifying the command line to invoke in a configuration variable mergetool.<tool>.cmd.

When git-mergetool is invoked with this tool (either through the -t or --tool option or the merge.tool configuration @@ -388,7 +388,7 @@ success of the resolution after the custom tool has exited.

diff --git a/git-mergetool.txt b/git-mergetool.txt index 31570b1e2..e0b2703b3 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -40,7 +40,7 @@ tool is available in PATH. + Instead of running one of the known merge tool programs 'git-mergetool' can be customized to run an alternative program -by specifying the command line to invoke in a configration +by specifying the command line to invoke in a configuration variable `mergetool..cmd`. + When 'git-mergetool' is invoked with this tool (either through the diff --git a/git-svn.html b/git-svn.html index cbac2b3d6..6c5212261 100644 --- a/git-svn.html +++ b/git-svn.html @@ -326,7 +326,7 @@ git-svn(1) Manual Page

git-svn is a simple conduit for changesets between Subversion and git. It provides a bidirectional flow of changes between a Subversion and a git -respository.

+repository.

git-svn can track a single Subversion branch simply by using a URL to the branch, follow branches laid out in the Subversion recommended method (trunk, branches, tags directories) with the --stdlayout option, or @@ -696,7 +696,7 @@ environment). This command has the same behaviour. Recursively finds the svn:ignore property on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a - specfic revision. + specific revision.

@@ -1219,7 +1219,7 @@ should be manually entered with a text-editor or using git-config.

< diff --git a/git-svn.txt b/git-svn.txt index f230125a8..773ae9654 100644 --- a/git-svn.txt +++ b/git-svn.txt @@ -13,7 +13,7 @@ DESCRIPTION ----------- 'git-svn' is a simple conduit for changesets between Subversion and git. It provides a bidirectional flow of changes between a Subversion and a git -respository. +repository. 'git-svn' can track a single Subversion branch simply by using a URL to the branch, follow branches laid out in the Subversion recommended @@ -209,7 +209,7 @@ Any other arguments are passed directly to 'git-log' Recursively finds the svn:ignore property on directories and creates matching .gitignore files. The resulting files are staged to be committed, but are not committed. Use -r/--revision to refer to a - specfic revision. + specific revision. 'show-ignore':: Recursively finds and lists the svn:ignore property on diff --git a/merge-config.txt b/merge-config.txt index 48ce747cf..00277e061 100644 --- a/merge-config.txt +++ b/merge-config.txt @@ -1,5 +1,5 @@ merge.stat:: - Whether to print the diffstat berween ORIG_HEAD and merge result + Whether to print the diffstat between ORIG_HEAD and merge result at the end of the merge. True by default. merge.log:: @@ -16,7 +16,7 @@ merge.tool:: linkgit:git-mergetool[1]. Valid built-in values are: "kdiff3", "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff". Any other value is treated is custom merge tool - and there must be a corresponing mergetool..cmd option. + and there must be a corresponding mergetool..cmd option. merge.verbosity:: Controls the amount of output shown by the recursive merge -- 2.26.2