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
- "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".
- 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
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.
* "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
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).
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
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
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.
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].
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<meta name="generator" content="AsciiDoc 8.2.5" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
margin: 1em 5% 1em 5%;\r
}\r
\r
-a { color: blue; }\r
-a:visited { color: fuchsia; }\r
+a {\r
+ color: blue;\r
+ text-decoration: underline;\r
+}\r
+a:visited {\r
+ color: fuchsia;\r
+}\r
\r
em {\r
font-style: italic;\r
line-height: 1.3;\r
}\r
\r
-h1 {\r
+h1, h2, h3 {\r
border-bottom: 2px solid silver;\r
}\r
h2 {\r
- border-bottom: 2px solid silver;\r
padding-top: 0.5em;\r
}\r
+h3 {\r
+ float: left;\r
+}\r
+h3 + * {\r
+ clear: left;\r
+}\r
\r
div.sectionbody {\r
font-family: serif;\r
color: #527bbd;\r
font-family: sans-serif;\r
font-weight: bold;\r
- font-size: 1.2em;\r
+ font-size: 1.1em;\r
}\r
span#email {\r
}\r
padding: 0.5em;\r
}\r
\r
+div.listingblock {\r
+ margin-right: 0%;\r
+}\r
div.listingblock > div.content {\r
border: 1px solid silver;\r
background: #f4f4f4;\r
div.quoteblock > div.content {\r
padding-left: 2.0em;\r
}\r
-div.quoteblock .attribution {\r
+\r
+div.attribution {\r
text-align: right;\r
}\r
+div.verseblock + div.attribution {\r
+ text-align: left;\r
+}\r
\r
div.admonitionblock .icon {\r
vertical-align: top;\r
ul, ol {\r
list-style-position: outside;\r
}\r
-ol.olist2 {\r
+div.olist2 ol {\r
list-style-type: lower-alpha;\r
}\r
\r
div.tableblock > table {\r
- border-color: #527bbd;\r
- border-width: 3px;\r
+ border: 3px solid #527bbd;\r
}\r
thead {\r
font-family: sans-serif;\r
margin-top: 0.8em;\r
margin-bottom: 0.8em;\r
}\r
+div.hlist td {\r
+ padding-bottom: 5px;\r
+}\r
td.hlist1 {\r
vertical-align: top;\r
font-style: italic;\r
@media print {\r
div#footer-badges { display: none; }\r
}\r
-include::./stylesheets/xhtml11-manpage.css[]\r
+\r
+div#toctitle {\r
+ color: #527bbd;\r
+ font-family: sans-serif;\r
+ font-size: 1.1em;\r
+ font-weight: bold;\r
+ margin-top: 1.0em;\r
+ margin-bottom: 0.1em;\r
+}\r
+\r
+div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {\r
+ margin-top: 0;\r
+ margin-bottom: 0;\r
+}\r
+div.toclevel2 {\r
+ margin-left: 2em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel3 {\r
+ margin-left: 4em;\r
+ font-size: 0.9em;\r
+}\r
+div.toclevel4 {\r
+ margin-left: 6em;\r
+ font-size: 0.9em;\r
+}\r
+include1::./stylesheets/xhtml11-manpage.css[]\r
/* Workarounds for IE6's broken and incomplete CSS2. */\r
\r
div.sidebar-content {\r
border-left: 2px solid silver;\r
padding-left: 0.5em;\r
}\r
+\r
+/* IE6 sets dynamically generated links as visited. */\r
+div#toc a:visited { color: blue; }\r
</style>\r
<title>git-cat-file(1)</title>\r
</head>\r
<div class="content"><em>git cat-file</em> [-t | -s | -e | -p | <type>] <object>\r
<em>git cat-file</em> [--batch | --batch-check] < <list-of-objects></div></div>\r
</div>\r
-<h2>DESCRIPTION</h2>\r
+<h2 id="_description">DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>In the first form, provides content or type of objects in the repository. The\r
+<div class="para"><p>In the first form, provides content or type of objects in the repository. The\r
type is required unless <em>-t</em> or <em>-p</em> is used to find the object type, or <em>-s</em>\r
-is used to find the object size.</p>\r
-<p>In the second form, a list of object (separated by LFs) is provided on stdin,\r
-and the SHA1, type, and size of each object is printed on stdout.</p>\r
+is used to find the object size.</p></div>\r
+<div class="para"><p>In the second form, a list of object (separated by LFs) is provided on stdin,\r
+and the SHA1, type, and size of each object is printed on stdout.</p></div>\r
</div>\r
-<h2>OPTIONS</h2>\r
+<h2 id="_options">OPTIONS</h2>\r
<div class="sectionbody">\r
-<dl>\r
+<div class="vlist"><dl>\r
<dt>\r
<object>\r
</dt>\r
combined with any other options or arguments.\r
</p>\r
</dd>\r
-</dl>\r
+</dl></div>\r
</div>\r
-<h2>OUTPUT</h2>\r
+<h2 id="_output">OUTPUT</h2>\r
<div class="sectionbody">\r
-<p>If <em>-t</em> is specified, one of the <type>.</p>\r
-<p>If <em>-s</em> is specified, the size of the <object> in bytes.</p>\r
-<p>If <em>-e</em> is specified, no output.</p>\r
-<p>If <em>-p</em> is specified, the contents of <object> are pretty-printed.</p>\r
-<p>If <type> is specified, the raw (though uncompressed) contents of the <object>\r
-will be returned.</p>\r
-<p>If <em>--batch</em> is specified, output of the following form is printed for each\r
-object specified on stdin:</p>\r
+<div class="para"><p>If <em>-t</em> is specified, one of the <type>.</p></div>\r
+<div class="para"><p>If <em>-s</em> is specified, the size of the <object> in bytes.</p></div>\r
+<div class="para"><p>If <em>-e</em> is specified, no output.</p></div>\r
+<div class="para"><p>If <em>-p</em> is specified, the contents of <object> are pretty-printed.</p></div>\r
+<div class="para"><p>If <type> is specified, the raw (though uncompressed) contents of the <object>\r
+will be returned.</p></div>\r
+<div class="para"><p>If <em>--batch</em> is specified, output of the following form is printed for each\r
+object specified on stdin:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt><sha1> SP <type> SP <size> LF\r
<contents> LF</tt></pre>\r
</div></div>\r
-<p>If <em>--batch-check</em> is specified, output of the following form is printed for\r
-each object specified fon stdin:</p>\r
+<div class="para"><p>If <em>--batch-check</em> is specified, output of the following form is printed for\r
+each object specified on stdin:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt><sha1> SP <type> SP <size> LF</tt></pre>\r
</div></div>\r
-<p>For both <em>--batch</em> and <em>--batch-check</em>, output of the following form is printed\r
-for each object specified on stdin that does not exist in the repository:</p>\r
+<div class="para"><p>For both <em>--batch</em> and <em>--batch-check</em>, output of the following form is printed\r
+for each object specified on stdin that does not exist in the repository:</p></div>\r
<div class="listingblock">\r
<div class="content">\r
<pre><tt><object> SP missing LF</tt></pre>\r
</div></div>\r
</div>\r
-<h2>Author</h2>\r
+<h2 id="_author">Author</h2>\r
<div class="sectionbody">\r
-<p>Written by Linus Torvalds <torvalds@osdl.org></p>\r
+<div class="para"><p>Written by Linus Torvalds <torvalds@osdl.org></p></div>\r
</div>\r
-<h2>Documentation</h2>\r
+<h2 id="_documentation">Documentation</h2>\r
<div class="sectionbody">\r
-<p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p>\r
+<div class="para"><p>Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>\r
</div>\r
-<h2>GIT</h2>\r
+<h2 id="_git">GIT</h2>\r
<div class="sectionbody">\r
-<p>Part of the <a href="git.html">git(1)</a> suite</p>\r
+<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 02-Jul-2008 03:01:34 UTC\r
+Last updated 2008-08-06 06:19:08 UTC\r
</div>\r
</div>\r
</body>\r
------------
If '--batch-check' is specified, output of the following form is printed for
-each object specified fon stdin:
+each object specified on stdin:
------------
<sha1> SP <type> SP <size> LF
files to determine the <em>-k</em> modes to use. If <tt>crlf</tt> is set,\r
the <em>-k</em> mode will be left blank, so cvs clients will\r
treat it as text. If <tt>crlf</tt> is explicitly unset, the file\r
- will be set with <em>-kb</em> mode, which supresses any newline munging\r
+ will be set with <em>-kb</em> mode, which suppresses any newline munging\r
the client might otherwise do. If <tt>crlf</tt> is not specified,\r
then <em>gitcvs.allbinary</em> is used. See <a href="gitattributes.html">gitattributes(5)</a>.</p></div>\r
<div class="vlist"><dl>\r
</dt>\r
<dd>\r
<p>\r
- Whether to print the diffstat berween ORIG_HEAD and merge result\r
+ Whether to print the diffstat between ORIG_HEAD and merge result\r
at the end of the merge. True by default.\r
</p>\r
</dd>\r
<a href="git-mergetool.html">git-mergetool(1)</a>. Valid built-in values are: "kdiff3",\r
"tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and\r
"opendiff". Any other value is treated is custom merge tool\r
- and there must be a corresponing mergetool.<tool>.cmd option.\r
+ and there must be a corresponding mergetool.<tool>.cmd option.\r
</p>\r
</dd>\r
<dt>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-29 08:16:52 UTC\r
+Last updated 2008-08-06 06:19:08 UTC\r
</div>\r
</div>\r
</body>\r
<dd>\r
<p>\r
If one or more patterns are given, only refs are shown that\r
- match againt at least one pattern, either using fnmatch(3) or\r
+ match against at least one pattern, either using fnmatch(3) or\r
literally, in the latter case matching completely or from the\r
beginning up to a slash.\r
</p>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-31 22:10:19 UTC\r
+Last updated 2008-08-06 06:19:08 UTC\r
</div>\r
</div>\r
</body>\r
<pattern>...::
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.
</dt>\r
<dd>\r
<p>\r
- Whether to print the diffstat berween ORIG_HEAD and merge result\r
+ Whether to print the diffstat between ORIG_HEAD and merge result\r
at the end of the merge. True by default.\r
</p>\r
</dd>\r
<a href="git-mergetool.html">git-mergetool(1)</a>. Valid built-in values are: "kdiff3",\r
"tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and\r
"opendiff". Any other value is treated is custom merge tool\r
- and there must be a corresponing mergetool.<tool>.cmd option.\r
+ and there must be a corresponding mergetool.<tool>.cmd option.\r
</p>\r
</dd>\r
<dt>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-31 22:10:20 UTC\r
+Last updated 2008-08-06 06:19:09 UTC\r
</div>\r
</div>\r
</body>\r
tool is available in PATH.</p></div>\r
<div class="para"><p>Instead of running one of the known merge tool programs\r
<em>git-mergetool</em> can be customized to run an alternative program\r
-by specifying the command line to invoke in a configration\r
+by specifying the command line to invoke in a configuration\r
variable <tt>mergetool.<tool>.cmd</tt>.</p></div>\r
<div class="para"><p>When <em>git-mergetool</em> is invoked with this tool (either through the\r
<tt>-t</tt> or <tt>--tool</tt> option or the <tt>merge.tool</tt> configuration\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:54 UTC\r
+Last updated 2008-08-06 06:19:09 UTC\r
</div>\r
</div>\r
</body>\r
+
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
<div class="sectionbody">\r
<div class="para"><p><em>git-svn</em> is a simple conduit for changesets between Subversion and git.\r
It provides a bidirectional flow of changes between a Subversion and a git\r
-respository.</p></div>\r
+repository.</p></div>\r
<div class="para"><p><em>git-svn</em> can track a single Subversion branch simply by using a\r
URL to the branch, follow branches laid out in the Subversion recommended\r
method (trunk, branches, tags directories) with the --stdlayout option, or\r
Recursively finds the svn:ignore property on directories and\r
creates matching .gitignore files. The resulting files are staged to\r
be committed, but are not committed. Use -r/--revision to refer to a\r
- specfic revision.\r
+ specific revision.\r
</p>\r
</dd>\r
<dt>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-30 18:31:06 UTC\r
+Last updated 2008-08-06 06:19:10 UTC\r
</div>\r
</div>\r
</body>\r
-----------
'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
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
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::
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.<tool>.cmd option.
+ and there must be a corresponding mergetool.<tool>.cmd option.
merge.verbosity::
Controls the amount of output shown by the recursive merge
projects / git.git / commitdiff