Permalink
Browse files

Autogenerated HTML docs for v1.8.5.2-309-ga2501

  • Loading branch information...
gitster committed Jan 10, 2014
1 parent 9906f1f commit 21bc18b3b222ee68dc0f58c7ff6c92fd44938b2d
View
@@ -19,6 +19,10 @@ The meanings of "--tags" option to "git fetch" has changed; the
command fetches tags _in addition to_ what are fetched by the same
command line without the option.
+The way "git push $there $what" interprets $what part given on the
+command line, when it does not have a colon that explicitly tells us
+what ref at the $there repository is to be updated, has been enhanced.
+
A handful of ancient commands that have long been deprecated are
finally gone (repo-config, tar-tree, lost-found, and peek-remote).
@@ -81,9 +85,50 @@ Foreign interfaces, subsystems and ports.
* Various bugfixes to remote-bzr and remote-hg (in contrib/).
+ * The build procedure is aware of MirBSD now.
+
UI, Workflows & Features
+ * Two-level configuration variable names in "branch.*" and "remote.*"
+ hierarchies, whose variables are predominantly three-level, were
+ not completed by hitting a <TAB> in bash and zsh completions.
+
+ * Fetching 'frotz' branch with "git fetch", while 'frotz/nitfol'
+ remote-tracking branch from an earlier fetch was still there, would
+ error out, primarily because the command was not told that it is
+ allowed to lose any information on our side. "git fetch --prune"
+ now can be used to remove 'frotz/nitfol' to make room to fetch and
+ store 'frotz' remote-tracking branch.
+
+ * "diff.orderfile=<file>" configuration variable can be used to
+ pretend as if the "-O<file>" option were given from the command
+ line of "git diff", etc.
+
+ * The negative pathspec syntax allows "git log -- . ':!dir'" to tell
+ us "I am interested in everything but 'dir' directory".
+
+ * "git difftool" shows how many different paths there are in total,
+ and how many of them have been shown so far, to indicate progress.
+
+ * "git push origin master" used to push our 'master' branch to update
+ the 'master' branch at the 'origin' repository. This has been
+ enhanced to use the same ref mapping "git push origin" would use to
+ determine what ref at the 'origin' to be updated with our 'master'.
+ For example, with this configuration
+
+ [remote "origin"]
+ push = refs/heads/*:refs/review/*
+
+ that would cause "git push origin" to push out our local branches
+ to corresponding refs under refs/review/ hierarchy at 'origin',
+ "git push origin master" would update 'refs/review/master' over
+ there. Alternatively, if push.default is set to 'upstream' and our
+ 'master' is set to integrate with 'topic' from the 'origin' branch,
+ running "git push origin" while on our 'master' would update their
+ 'topic' branch, and running "git push origin master" while on any
+ of our branches does the same.
+
* "gitweb" learned to treat ref hierarchies other than refs/heads as
if they are additional branch namespaces (e.g. refs/changes/ in
Gerrit).
@@ -109,6 +154,16 @@ UI, Workflows & Features
Performance, Internal Implementation, etc.
+ * The naming convention of the packfiles has been updated; it used to
+ be based on the enumeration of names of the objects that are
+ contained in the pack, but now it also depends on how the packed
+ result is represented---packing the same set of objects using
+ different settings (or delta order) would produce a pack with
+ different name.
+
+ * "git diff --no-index" mode used to unnecessarily attempt to read
+ the index when there is one.
+
* The deprecated parse-options macro OPT_BOOLEAN has been removed;
use OPT_BOOL or OPT_COUNTUP in new code.
@@ -122,7 +177,8 @@ Performance, Internal Implementation, etc.
* "git merge-base" learned the "--fork-point" mode, that implements
the same logic used in "git pull --rebase" to find a suitable fork
point out of the reflog entries for the remote-tracking branch the
- work has been based on.
+ work has been based on. "git rebase" has the same logic that can be
+ triggered with the "--fork-point" option.
* A third-party "receive-pack" (the responder to "git push") can
advertise the "no-thin" capability to tell "git push" not to use
@@ -141,6 +197,63 @@ Unless otherwise noted, all the fixes since v1.8.5 in the maintenance
track are contained in this release (see the maintenance releases' notes
for details).
+ * The "--[no-]informative-errors" options to "git daemon" were parsed
+ a bit too loosely, allowing any other string after these option
+ names.
+ (merge 82246b7 nd/daemon-informative-errors-typofix later to maint).
+
+ * There is no reason to have a hardcoded upper limit of the number of
+ parents for an octopus merge, created via the graft mechanism, but
+ there was.
+ (merge e228c17 js/lift-parent-count-limit later to maint).
+
+ * The basic test used to leave unnecessary trash directories in the
+ t/ directory.
+ (merge 738a8be jk/test-framework-updates later to maint).
+
+ * "git merge-base --octopus" used to leave cleaning up suboptimal
+ result to the caller, but now it does the clean-up itself.
+ (merge 8f29299 bm/merge-base-octopus-dedup later to maint).
+
+ * A "gc" process running as a different user should be able to stop a
+ new "gc" process from starting, but it didn't.
+ (merge ed7eda8 km/gc-eperm later to maint).
+
+ * An earlier "clean-up" introduced an unnecessary memory leak.
+ (merge e1c1a32 jk/credential-plug-leak later to maint).
+
+ * "git add -A" (no other arguments) in a totally empty working tree
+ used to emit an error.
+ (merge 64ed07c nd/add-empty-fix later to maint).
+
+ * "git log --decorate" did not handle a tag pointed by another tag
+ nicely.
+ (merge 5e1361c bc/log-decoration later to maint).
+
+ * When we figure out how many file descriptors to allocate for
+ keeping packfiles open, a system with non-working getrlimit() could
+ cause us to die(), but because we make this call only to get a
+ rough estimate of how many is available and we do not even attempt
+ to use up all file descriptors available ourselves, it is nicer to
+ fall back to a reasonable low value rather than dying.
+ (merge 491a8de jh/rlimit-nofile-fallback later to maint).
+
+ * read_sha1_file(), that is the workhorse to read the contents given
+ an object name, honoured object replacements, but there was no
+ corresponding mechanism to sha1_object_info() that was used to
+ obtain the metainfo (e.g. type & size) about the object. This led
+ callers to weird inconsistencies.
+ (merge 663a856 cc/replace-object-info later to maint).
+
+ * "git cat-file --batch=", an admittedly useless command, did not
+ behave very well.
+ (merge 6554dfa jk/cat-file-regression-fix later to maint).
+
+ * "git rev-parse <revs> -- <paths>" did not implement the usual
+ disambiguation rules the commands in the "git log" family used in
+ the same way.
+ (merge 62f162f jk/rev-parse-double-dashes later to maint).
+
* "git mv A B/", when B does not exist as a directory, should error
out, but it didn't.
(merge c57f628 mm/mv-file-to-no-such-dir-with-slash later to maint).
View
@@ -98,6 +98,11 @@ diff.mnemonicprefix::
diff.noprefix::
If set, 'git diff' does not show any source or destination prefix.
+diff.orderfile::
+ File indicating how to order files within a diff, using
+ one shell glob pattern per line.
+ Can be overridden by the '-O' option to linkgit:git-diff[1].
+
diff.renameLimit::
The number of files to consider when performing the copy/rename
detection; equivalent to the 'git diff' option '-l'.
View
@@ -432,6 +432,9 @@ endif::git-format-patch[]
-O<orderfile>::
Output the patch in the order specified in the
<orderfile>, which has one shell glob pattern per line.
+ This overrides the `diff.orderfile` configuration variable
+ (see linkgit:git-config[1]). To cancel `diff.orderfile`,
+ use `-O/dev/null`.
ifndef::git-format-patch[]
-R::
View
@@ -922,6 +922,16 @@ <h2 id="_batch_output">BATCH OUTPUT</h2>
</p>
</dd>
<dt class="hdlist1">
+<code>deltabase</code>
+</dt>
+<dd>
+<p>
+ If the object is stored as a delta on-disk, this expands to the
+ 40-hex sha1 of the delta base object. Otherwise, expands to the
+ null sha1 (40 zeroes). See <code>CAVEATS</code> below.
+</p>
+</dd>
+<dt class="hdlist1">
<code>rest</code>
</dt>
<dd>
@@ -966,9 +976,10 @@ <h2 id="_caveats">CAVEATS</h2>
responsible for disk usage. The size of a packed non-delta object may be
much larger than the size of objects which delta against it, but the
choice of which object is the base and which is the delta is arbitrary
-and is subject to change during a repack. Note also that multiple copies
-of an object may be present in the object database; in this case, it is
-undefined which copy&#8217;s size will be reported.</p></div>
+and is subject to change during a repack.</p></div>
+<div class="paragraph"><p>Note also that multiple copies of an object may be present in the object
+database; in this case, it is undefined which copy&#8217;s size or delta base
+will be reported.</p></div>
</div>
</div>
<div class="sect1">
@@ -981,7 +992,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-09-17 14:33:14 PDT
+Last updated 2014-01-10 12:32:20 PST
</div>
</div>
</body>
View
@@ -109,6 +109,11 @@ newline. The available atoms are:
The size, in bytes, that the object takes up on disk. See the
note about on-disk sizes in the `CAVEATS` section below.
+`deltabase`::
+ If the object is stored as a delta on-disk, this expands to the
+ 40-hex sha1 of the delta base object. Otherwise, expands to the
+ null sha1 (40 zeroes). See `CAVEATS` below.
+
`rest`::
If this atom is used in the output string, input lines are split
at the first whitespace boundary. All characters before that
@@ -152,10 +157,11 @@ should be taken in drawing conclusions about which refs or objects are
responsible for disk usage. The size of a packed non-delta object may be
much larger than the size of objects which delta against it, but the
choice of which object is the base and which is the delta is arbitrary
-and is subject to change during a repack. Note also that multiple copies
-of an object may be present in the object database; in this case, it is
-undefined which copy's size will be reported.
+and is subject to change during a repack.
+Note also that multiple copies of an object may be present in the object
+database; in this case, it is undefined which copy's size or delta base
+will be reported.
GIT
---
View
@@ -3149,6 +3149,16 @@ <h3 id="_variables">Variables</h3>
</p>
</dd>
<dt class="hdlist1">
+diff.orderfile
+</dt>
+<dd>
+<p>
+ File indicating how to order files within a diff, using
+ one shell glob pattern per line.
+ Can be overridden by the <em>-O</em> option to <a href="git-diff.html">git-diff(1)</a>.
+</p>
+</dd>
+<dt class="hdlist1">
diff.renameLimit
</dt>
<dd>
View
@@ -1429,6 +1429,9 @@ <h2 id="_options">OPTIONS</h2>
<p>
Output the patch in the order specified in the
&lt;orderfile&gt;, which has one shell glob pattern per line.
+ This overrides the <code>diff.orderfile</code> configuration variable
+ (see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderfile</code>,
+ use <code>-O/dev/null</code>.
</p>
</dd>
<dt class="hdlist1">
View
@@ -1430,6 +1430,9 @@ <h2 id="_options">OPTIONS</h2>
<p>
Output the patch in the order specified in the
&lt;orderfile&gt;, which has one shell glob pattern per line.
+ This overrides the <code>diff.orderfile</code> configuration variable
+ (see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderfile</code>,
+ use <code>-O/dev/null</code>.
</p>
</dd>
<dt class="hdlist1">
View
@@ -1431,6 +1431,9 @@ <h2 id="_options">OPTIONS</h2>
<p>
Output the patch in the order specified in the
&lt;orderfile&gt;, which has one shell glob pattern per line.
+ This overrides the <code>diff.orderfile</code> configuration variable
+ (see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderfile</code>,
+ use <code>-O/dev/null</code>.
</p>
</dd>
<dt class="hdlist1">
View
@@ -1540,6 +1540,9 @@ <h2 id="_options">OPTIONS</h2>
<p>
Output the patch in the order specified in the
&lt;orderfile&gt;, which has one shell glob pattern per line.
+ This overrides the <code>diff.orderfile</code> configuration variable
+ (see <a href="git-config.html">git-config(1)</a>). To cancel <code>diff.orderfile</code>,
+ use <code>-O/dev/null</code>.
</p>
</dd>
<dt class="hdlist1">
View
@@ -1167,7 +1167,7 @@ <h2 id="_examples">Examples</h2>
<div class="sect1">
<h2 id="_checklist_for_shrinking_a_repository">Checklist for Shrinking a Repository</h2>
<div class="sectionbody">
-<div class="paragraph"><p>git-filter-branch is often used to get rid of a subset of files,
+<div class="paragraph"><p>git-filter-branch can be used to get rid of a subset of files,
usually with some combination of <code>--index-filter</code> and
<code>--subdirectory-filter</code>. People expect the resulting repository to
be smaller than the original, but you need a few more steps to
@@ -1227,6 +1227,49 @@ <h2 id="_checklist_for_shrinking_a_repository">Checklist for Shrinking a Reposit
</div>
</div>
<div class="sect1">
+<h2 id="_notes">Notes</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>git-filter-branch allows you to make complex shell-scripted rewrites
+of your Git history, but you probably don&#8217;t need this flexibility if
+you&#8217;re simply <em>removing unwanted data</em> like large files or passwords.
+For those operations you may want to consider
+<a href="http://rtyley.github.io/bfg-repo-cleaner/">The BFG Repo-Cleaner</a>,
+a JVM-based alternative to git-filter-branch, typically at least
+10-50x faster for those use-cases, and with quite different
+characteristics:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Any particular version of a file is cleaned exactly <em>once</em>. The BFG,
+ unlike git-filter-branch, does not give you the opportunity to
+ handle a file differently based on where or when it was committed
+ within your history. This constraint gives the core performance
+ benefit of The BFG, and is well-suited to the task of cleansing bad
+ data - you don&#8217;t care <em>where</em> the bad data is, you just want it
+ <em>gone</em>.
+</p>
+</li>
+<li>
+<p>
+By default The BFG takes full advantage of multi-core machines,
+ cleansing commit file-trees in parallel. git-filter-branch cleans
+ commits sequentially (ie in a single-threaded manner), though it
+ <em>is</em> possible to write filters that include their own parallellism,
+ in the scripts executed against each commit.
+</p>
+</li>
+<li>
+<p>
+The <a href="http://rtyley.github.io/bfg-repo-cleaner/#examples">command options</a>
+ are much more restrictive than git-filter branch, and dedicated just
+ to the tasks of removing unwanted data- e.g:
+ <code>--strip-blobs-bigger-than 1M</code>.
+</p>
+</li>
+</ul></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_git">GIT</h2>
<div class="sectionbody">
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
@@ -1236,7 +1279,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-20 08:40:27 PDT
+Last updated 2014-01-10 12:32:20 PST
</div>
</div>
</body>
Oops, something went wrong.

0 comments on commit 21bc18b

Please sign in to comment.