--- /dev/null
+GIT v1.5.6.4 Release Notes
+==========================
+
+Fixes since v1.5.6.3
+--------------------
+
+* Various commands could overflow its internal buffer on a platform
+ with small PATH_MAX value in a repository that has contents with
+ long pathnames.
+
+* There wasn't a way to make --pretty=format:%<> specifiers to honor
+ .mailmap name rewriting for authors and committers. Now you can with
+ %aN and %cN.
+
+* Bash completion wasted too many cycles; this has been optimized to be
+ usable again.
+
+* Bash completion lost ref part when completing something like "git show
+ pu:Makefile".
+
+* "git-cvsserver" did not clean up its temporary working area after annotate
+ request.
+
+* "git-daemon" called syslog() from its signal handler, which was a
+ no-no.
+
+* "git-fetch" into an empty repository used to remind that the fetch will
+ be huge by saying "no common commits", but this was an unnecessary
+ noise; it is already known by the user anyway.
+
+* "git-mailinfo" (hence "git-am") did not correctly handle in-body [PATCH]
+ line to override the commit title taken from the mail Subject header.
+
+* "git-rebase -i -p" lost parents that are not involved in the history
+ being rewritten.
+
+Contains other various documentation fixes.
+
+--
+exec >/var/tmp/1
+echo O=$(git describe maint)
+O=v1.5.6.3-21-gebcce31
+git shortlog --no-merges $O..maint
GIT_LOCAL_CONFIG, also only documented as affecting "git config" and
not different from GIT_CONFIG in a useful way, is removed.
+The ".dotest" temporary area "git am" and "git rebase" use is now moved
+inside the $GIT_DIR, to avoid mistakes of adding it to the project by
+accident.
+
An ancient merge strategy "stupid" has been removed.
(performance, robustness, sanity etc.)
-* even more documentation pages are now accessible via "man" and "git help".
+* index-pack used too much memory when dealing with a deep delta chain.
+ This has been optimized.
* reduced excessive inlining to shrink size of the "git" binary.
repack -a -f" can be used to fix such a corruption as long as necessary
objects are available.
+* Performance of "git-blame -C -C" operation is vastly improved.
+
* git-clone does not create refs in loose form anymore (it behaves as
if you immediately ran git-pack-refs after cloning). This will help
repositories with insanely large number of refs.
(usability, bells and whistles)
+* even more documentation pages are now accessible via "man" and "git help".
+
* A new environment variable GIT_CEILING_DIRECTORIES can be used to stop
the discovery process of the toplevel of working tree; this may be useful
when you are working in a slow network disk and are outside any working tree,
(internal)
+* git-merge has been reimplemented in C.
+
Fixes since v1.5.6
------------------
All of the fixes in v1.5.6 maintenance series are included in
this release, unless otherwise noted.
- * "git fetch" into an empty repository used to remind the fetch will
- be huge by saying "no common commits", but it is already known by
- the user anyway (need to backport 8cb560f to 'maint').
-
---
exec >/var/tmp/1
-O=v1.5.6.3-350-g499027b
+O=v1.5.6.3-436-g1f8dc67
echo O=$(git describe refs/heads/master)
git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
Usually the command automatically creates a commit with\r
a commit log message stating which commit was\r
cherry-picked. This flag applies the change necessary\r
- to cherry-pick the named commit to your working tree,\r
- but does not make the commit. In addition, when this\r
- option is used, your working tree does not have to match\r
+ to cherry-pick the named commit to your working tree\r
+ and the index, but does not make the commit. In addition,\r
+ when this option is used, your index does not have to match\r
the HEAD commit. The cherry-pick is done against the\r
- beginning state of your working tree.\r
+ beginning state of your index.\r
</p>\r
<div class="para"><p>This is useful when cherry-picking more than one commits'\r
-effect to your working tree in a row.</p></div>\r
+effect to your index in a row.</p></div>\r
</dd>\r
<dt>\r
-s\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:16:38 UTC\r
+Last updated 2008-07-17 08:08:28 UTC\r
</div>\r
</div>\r
</body>\r
Usually the command automatically creates a commit with
a commit log message stating which commit was
cherry-picked. This flag applies the change necessary
- to cherry-pick the named commit to your working tree,
- but does not make the commit. In addition, when this
- option is used, your working tree does not have to match
+ to cherry-pick the named commit to your working tree
+ and the index, but does not make the commit. In addition,
+ when this option is used, your index does not have to match
the HEAD commit. The cherry-pick is done against the
- beginning state of your working tree.
+ beginning state of your index.
+
This is useful when cherry-picking more than one commits'
-effect to your working tree in a row.
+effect to your index in a row.
-s::
--signoff::
<dd>\r
<p>\r
Usually the command automatically creates a commit with\r
- a commit log message stating which commit was reverted.\r
- This flag applies the change necessary to revert the\r
- named commit to your working tree, but does not make the\r
- commit. In addition, when this option is used, your\r
- working tree does not have to match the HEAD commit.\r
- The revert is done against the beginning state of your\r
- working tree.\r
+ a commit log message stating which commit was\r
+ reverted. This flag applies the change necessary\r
+ to revert the named commit to your working tree\r
+ and the index, but does not make the commit. In addition,\r
+ when this option is used, your index does not have to match\r
+ the HEAD commit. The revert is done against the\r
+ beginning state of your index.\r
</p>\r
<div class="para"><p>This is useful when reverting more than one commits'\r
-effect to your working tree in a row.</p></div>\r
+effect to your index in a row.</p></div>\r
</dd>\r
<dt>\r
-s\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-06 05:17:00 UTC\r
+Last updated 2008-07-17 08:08:28 UTC\r
</div>\r
</div>\r
</body>\r
-n::
--no-commit::
Usually the command automatically creates a commit with
- a commit log message stating which commit was reverted.
- This flag applies the change necessary to revert the
- named commit to your working tree, but does not make the
- commit. In addition, when this option is used, your
- working tree does not have to match the HEAD commit.
- The revert is done against the beginning state of your
- working tree.
+ a commit log message stating which commit was
+ reverted. This flag applies the change necessary
+ to revert the named commit to your working tree
+ and the index, but does not make the commit. In addition,
+ when this option is used, your index does not have to match
+ the HEAD commit. The revert is done against the
+ beginning state of your index.
+
This is useful when reverting more than one commits'
-effect to your working tree in a row.
+effect to your index in a row.
-s::
--signoff::
<em>git submodule</em> [--quiet] update [--init] [--] [<path>…]\r
<em>git submodule</em> [--quiet] summary [--summary-limit <n>] [commit] [--] [<path>…]</div></div>\r
</div>\r
+<h2 id="_description">DESCRIPTION</h2>\r
+<div class="sectionbody">\r
+<div class="para"><p>Submodules are a special kind of tree entries which refer to a particular tree\r
+state in another repository. The tree entry describes\r
+the existence of a submodule with the given name and the exact revision that\r
+should be used, while an entry in <tt>.gitmodules</tt> file gives the location of\r
+the repository.</p></div>\r
+<div class="para"><p>When checked out, submodules will maintain their own independent repositories\r
+within their directories; the only link between the submodule and the "parent\r
+project" is the tree entry within the parent project mentioned above.</p></div>\r
+<div class="para"><p>This command will manage the tree entries and contents of the gitmodules file\r
+for you, as well as inspecting the status of your submodules and updating them.\r
+When adding a new submodule to the tree, the <em>add</em> subcommand is to be used.\r
+However, when pulling a tree containing submodules, these will not be checked\r
+out by default; the <em>init</em> and <em>update</em> subcommands will maintain submodules\r
+checked out and at appropriate revision in your working tree. You can inspect\r
+the current status of your submodules using the <em>submodule</em> subcommand and get\r
+an overview of changes <em>update</em> would perform using the <em>summary</em> subcommand.</p></div>\r
+</div>\r
<h2 id="_commands">COMMANDS</h2>\r
<div class="sectionbody">\r
<div class="vlist"><dl>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 2008-07-15 15:48:35 UTC\r
+Last updated 2008-07-17 08:08:29 UTC\r
</div>\r
</div>\r
</body>\r
'git submodule' [--quiet] summary [--summary-limit <n>] [commit] [--] [<path>...]
+DESCRIPTION
+-----------
+Submodules are a special kind of tree entries which refer to a particular tree
+state in another repository. The tree entry describes
+the existence of a submodule with the given name and the exact revision that
+should be used, while an entry in `.gitmodules` file gives the location of
+the repository.
+
+When checked out, submodules will maintain their own independent repositories
+within their directories; the only link between the submodule and the "parent
+project" is the tree entry within the parent project mentioned above.
+
+This command will manage the tree entries and contents of the gitmodules file
+for you, as well as inspecting the status of your submodules and updating them.
+When adding a new submodule to the tree, the 'add' subcommand is to be used.
+However, when pulling a tree containing submodules, these will not be checked
+out by default; the 'init' and 'update' subcommands will maintain submodules
+checked out and at appropriate revision in your working tree. You can inspect
+the current status of your submodules using the 'submodule' subcommand and get
+an overview of changes 'update' would perform using the 'summary' subcommand.
+
+
COMMANDS
--------
add::