Autogenerated HTML docs for v2.20.1-309-g16a465
diff --git a/RelNotes/2.21.0.txt b/RelNotes/2.21.0.txt
index 8a5e53b..ea78e22 100644
--- a/RelNotes/2.21.0.txt
+++ b/RelNotes/2.21.0.txt
@@ -24,6 +24,33 @@
object into account (e.g. a tag object would want to go under
refs/tags/).
+ * "git checkout [<tree-ish>] path..." learned to report the number of
+ paths that have been checked out of the index or the tree-ish,
+ which gives it the same degree of noisy-ness as the case in which
+ the command checks out a branch.
+
+ * "git quiltimport" learned "--keep-non-patch" option.
+
+ * "git worktree remove" and "git worktree move" refused to work when
+ there is a submodule involved. This has been loosened to ignore
+ uninitialized submodules.
+
+ * "git cherry-pick -m1" was forbidden when picking a non-merge
+ commit, even though there _is_ parent number 1 for such a commit.
+ This was done to avoid mistakes back when "cherry-pick" was about
+ picking a single commit, but is no longer useful with "cherry-pick"
+ that can pick a range of commits. Now the "-m$num" option is
+ allowed when picking any commit, as long as $num names an existing
+ parent of the commit.
+
+ * Update "git multimail" from the upstream.
+
+ * "git p4" update.
+
+ * The "--format=<placeholder>" option of for-each-ref, branch and tag
+ learned to show a few more traits of objects that can be learned by
+ the object_info API.
+
Performance, Internal Implementation, Development Support etc.
@@ -33,6 +60,23 @@
* More codepaths become aware of working with in-core repository
instance other than the default "the_repository".
+ * The "strncat()" function is now among the banned functions.
+
+ * Portability updates for the HPE NonStop platform.
+
+ * Earlier we added "-Wformat-security" to developer builds, assuming
+ that "-Wall" (which includes "-Wformat" which in turn is required
+ to use "-Wformat-security") is always in effect. This is not true
+ when config.mak.autogen is in use, unfortunately. This has been
+ fixed by unconditionally adding "-Wall" to developer builds.
+
+ * The loose object cache used to optimize existence look-up has been
+ updated.
+
+ * Flaky tests can now be repeatedly run under load with the
+ "--stress" option.
+ (merge fb7d1e3ac8 sg/stress-test later to maint).
+
Fixes since v2.20
-----------------
@@ -63,4 +107,82 @@
which has been corrected.
(merge 02818a98d7 mk/http-backend-kill-children-before-exit later to maint).
+ * "git rev-list --exclude-promisor-objects" had to take an object
+ that does not exist locally (and is lazily available) from the
+ command line without barfing, but the code dereferenced NULL.
+ (merge 4cf67869b2 md/list-lazy-objects-fix later to maint).
+
+ * The traversal over tree objects has learned to honor
+ ":(attr:label)" pathspec match, which has been implemented only for
+ enumerating paths on the filesystem.
+ (merge 5a0b97b34c nd/attr-pathspec-in-tree-walk later to maint).
+
+ * BSD port updates.
+ (merge 4e3ecbd439 cb/openbsd-allows-reading-directory later to maint).
+ (merge b6bdc2a0f5 cb/t5004-empty-tar-archive-fix later to maint).
+ (merge 82cbc8cde2 cb/test-lint-cp-a later to maint).
+
+ * Lines that begin with a certain keyword that come over the wire, as
+ well as lines that consist only of one of these keywords, ought to
+ be painted in color for easier eyeballing, but the latter was
+ broken ever since the feature was introduced in 2.19, which has
+ been corrected.
+ (merge 1f67290450 hn/highlight-sideband-keywords later to maint).
+
+ * "git log -G<regex>" looked for a hunk in the "git log -p" patch
+ output that contained a string that matches the given pattern.
+ Optimize this code to ignore binary files, which by default will
+ not show any hunk that would match any pattern (unless textconv or
+ the --text option is in effect, that is).
+ (merge e0e7cb8080 tb/log-G-binary later to maint).
+
+ * "git submodule update" ought to use a single job unless asked, but
+ by mistake used multiple jobs, which has been fixed.
+ (merge e3a9d1aca9 sb/submodule-fetchjobs-default-to-one later to maint).
+
+ * "git stripspace" should be usable outside a git repository, but
+ under the "-s" or "-c" mode, it didn't.
+ (merge 957da75802 jn/stripspace-wo-repository later to maint).
+
+ * Some of the documentation pages formatted incorrectly with
+ Asciidoctor, which have been fixed.
+ (merge b62eb1d2f4 ma/asciidoctor later to maint).
+
+ * The core.worktree setting in a submodule repository should not be
+ pointing at a directory when the submodule loses its working tree
+ (e.g. getting deinit'ed), but the code did not properly maintain
+ this invariant.
+
+ * With zsh, "git cmd path<TAB>" was completed to "git cmd path name"
+ when the completed path has a special character like SP in it,
+ without any attempt to keep "path name" a single filename. This
+ has been fixed to complete it to "git cmd path\ name" just like
+ Bash completion does.
+
+ * The test suite tried to see if it is run under bash, but the check
+ itself failed under some other implementations of shell (notably
+ under NetBSD). This has been corrected.
+ (merge 54ea72f09c sg/test-bash-version-fix later to maint).
+
+ * "git gc" and "git repack" did not close the open packfiles that
+ they found unneeded before removing them, which didn't work on a
+ platform incapable of removing an open file. This has been
+ corrected.
+ (merge 5bdece0d70 js/gc-repack-close-before-remove later to maint).
+
* Code cleanup, docfix, build fix, etc.
+ (merge 89ba9a79ae hb/t0061-dot-in-path-fix later to maint).
+ (merge d173e799ea sb/diff-color-moved-config-option-fixup later to maint).
+ (merge a8f5a59067 en/directory-renames-nothanks-doc-update later to maint).
+ (merge ec36c42a63 nd/indentation-fix later to maint).
+ (merge f116ee21cd do/gitweb-strict-export-conf-doc later to maint).
+ (merge 112ea42663 fd/gitweb-snapshot-conf-doc-fix later to maint).
+ (merge 1cadad6f65 tb/use-common-win32-pathfuncs-on-cygwin later to maint).
+ (merge 57e9dcaa65 km/rebase-doc-typofix later to maint).
+ (merge b8b4cb27e6 ds/gc-doc-typofix later to maint).
+ (merge 3b3357626e nd/style-opening-brace later to maint).
+ (merge b4583d5595 es/doc-worktree-guessremote-config later to maint).
+ (merge cce99cd8c6 ds/commit-graph-assert-missing-parents later to maint).
+ (merge 0650614982 cy/completion-typofix later to maint).
+ (merge 6881925ef5 rs/sha1-file-close-mapped-file-on-error later to maint).
+ (merge bd8d6f0def en/show-ref-doc-fix later to maint).
diff --git a/diff-options.txt b/diff-options.txt
index 0378cd5..b94d332 100644
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -524,6 +524,8 @@
came into being: use the feature iteratively to feed the interesting
block in the preimage back into `-S`, and keep going until you get the
very first version of the block.
++
+Binary files are searched as well.
-G<regex>::
Look for differences whose patch text contains added/removed
@@ -543,6 +545,9 @@
-S"regexec\(regexp" --pickaxe-regex` will not (because the number of
occurrences of that string did not change).
+
+Unless `--text` is supplied patches of binary files without a textconv
+filter will be ignored.
++
See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more
information.
diff --git a/git-column.html b/git-column.html
index 5138f16..9b57dd2 100644
--- a/git-column.html
+++ b/git-column.html
@@ -873,7 +873,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2018-10-16 16:37:05 JST
+ 2019-01-18 15:15:21 PST
</div>
</div>
</body>
diff --git a/git-column.txt b/git-column.txt
index 763afab..f58e9c4 100644
--- a/git-column.txt
+++ b/git-column.txt
@@ -47,7 +47,7 @@
The number of spaces between columns. One space by default.
EXAMPLES
-------
+--------
Format data by columns:
------------
diff --git a/git-config.html b/git-config.html
index 3acd1ee..1207eb8 100644
--- a/git-config.html
+++ b/git-config.html
@@ -8943,8 +8943,8 @@
</dt>
<dd>
<p>
- With <code>add</code>, if no branch argument, and neither of <code>-b</code> nor
- <code>-B</code> nor <code>--detach</code> are given, the command defaults to
+ If no branch is specified and neither <code>-b</code> nor <code>-B</code> nor
+ <code>--detach</code> is used, then <code>git worktree add</code> defaults to
creating a new branch from HEAD. If <code>worktree.guessRemote</code> is
set to true, <code>worktree add</code> tries to find a remote-tracking
branch whose name uniquely matches the new branch name. If
diff --git a/git-diff-files.html b/git-diff-files.html
index 912f458..3c78d0d 100644
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -1582,6 +1582,7 @@
came into being: use the feature iteratively to feed the interesting
block in the preimage back into <code>-S</code>, and keep going until you get the
very first version of the block.</p></div>
+<div class="paragraph"><p>Binary files are searched as well.</p></div>
</dd>
<dt class="hdlist1">
-G<regex>
@@ -1603,6 +1604,8 @@
<div class="paragraph"><p>While <code>git log -G"regexec\(regexp"</code> will show this commit, <code>git log
-S"regexec\(regexp" --pickaxe-regex</code> will not (because the number of
occurrences of that string did not change).</p></div>
+<div class="paragraph"><p>Unless <code>--text</code> is supplied patches of binary files without a textconv
+filter will be ignored.</p></div>
<div class="paragraph"><p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
information.</p></div>
</dd>
@@ -2539,7 +2542,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2018-01-27 08:11:04 JST
+ 2018-01-26 15:11:04 PST
</div>
</div>
</body>
diff --git a/git-diff-index.html b/git-diff-index.html
index dff1ba6..09c1e70 100644
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -1583,6 +1583,7 @@
came into being: use the feature iteratively to feed the interesting
block in the preimage back into <code>-S</code>, and keep going until you get the
very first version of the block.</p></div>
+<div class="paragraph"><p>Binary files are searched as well.</p></div>
</dd>
<dt class="hdlist1">
-G<regex>
@@ -1604,6 +1605,8 @@
<div class="paragraph"><p>While <code>git log -G"regexec\(regexp"</code> will show this commit, <code>git log
-S"regexec\(regexp" --pickaxe-regex</code> will not (because the number of
occurrences of that string did not change).</p></div>
+<div class="paragraph"><p>Unless <code>--text</code> is supplied patches of binary files without a textconv
+filter will be ignored.</p></div>
<div class="paragraph"><p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
information.</p></div>
</dd>
@@ -2623,7 +2626,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2018-05-23 16:06:29 JST
+ 2018-05-23 00:06:29 PDT
</div>
</div>
</body>
diff --git a/git-diff-tree.html b/git-diff-tree.html
index 84c099f..be1895a 100644
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -1584,6 +1584,7 @@
came into being: use the feature iteratively to feed the interesting
block in the preimage back into <code>-S</code>, and keep going until you get the
very first version of the block.</p></div>
+<div class="paragraph"><p>Binary files are searched as well.</p></div>
</dd>
<dt class="hdlist1">
-G<regex>
@@ -1605,6 +1606,8 @@
<div class="paragraph"><p>While <code>git log -G"regexec\(regexp"</code> will show this commit, <code>git log
-S"regexec\(regexp" --pickaxe-regex</code> will not (because the number of
occurrences of that string did not change).</p></div>
+<div class="paragraph"><p>Unless <code>--text</code> is supplied patches of binary files without a textconv
+filter will be ignored.</p></div>
<div class="paragraph"><p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
information.</p></div>
</dd>
@@ -3404,7 +3407,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2018-05-23 16:06:29 JST
+ 2018-05-23 00:06:29 PDT
</div>
</div>
</body>
diff --git a/git-diff.html b/git-diff.html
index 02b210c..2312f32 100644
--- a/git-diff.html
+++ b/git-diff.html
@@ -1695,6 +1695,7 @@
came into being: use the feature iteratively to feed the interesting
block in the preimage back into <code>-S</code>, and keep going until you get the
very first version of the block.</p></div>
+<div class="paragraph"><p>Binary files are searched as well.</p></div>
</dd>
<dt class="hdlist1">
-G<regex>
@@ -1716,6 +1717,8 @@
<div class="paragraph"><p>While <code>git log -G"regexec\(regexp"</code> will show this commit, <code>git log
-S"regexec\(regexp" --pickaxe-regex</code> will not (because the number of
occurrences of that string did not change).</p></div>
+<div class="paragraph"><p>Unless <code>--text</code> is supplied patches of binary files without a textconv
+filter will be ignored.</p></div>
<div class="paragraph"><p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
information.</p></div>
</dd>
@@ -2807,7 +2810,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2018-10-26 15:36:57 JST
+ 2018-10-25 23:36:57 PDT
</div>
</div>
</body>
diff --git a/git-for-each-ref.html b/git-for-each-ref.html
index 8277e2f..9d195ad 100644
--- a/git-for-each-ref.html
+++ b/git-for-each-ref.html
@@ -956,6 +956,8 @@
<dd>
<p>
The size of the object (the same as <em>git cat-file -s</em> reports).
+ Append <code>:disk</code> to get the size, in bytes, that the object takes up on
+ disk. See the note about on-disk sizes in the <code>CAVEATS</code> section below.
</p>
</dd>
<dt class="hdlist1">
@@ -971,6 +973,16 @@
</p>
</dd>
<dt class="hdlist1">
+deltabase
+</dt>
+<dd>
+<p>
+ This expands to the object name of the delta base for the
+ given object, if it is stored as a delta. Otherwise it
+ expands to the null object name (all zeroes).
+</p>
+</dd>
+<dt class="hdlist1">
upstream
</dt>
<dd>
@@ -1216,6 +1228,20 @@
</div>
</div>
<div class="sect1">
+<h2 id="_caveats">CAVEATS</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Note that the sizes of objects on disk are reported accurately, but care
+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.</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’s size or delta base
+will be reported.</p></div>
+</div>
+</div>
+<div class="sect1">
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="paragraph"><p><a href="git-show-ref.html">git-show-ref(1)</a></p></div>
@@ -1232,7 +1258,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2018-08-18 07:20:20 JST
+ 2019-01-18 15:15:21 PST
</div>
</div>
</body>
diff --git a/git-for-each-ref.txt b/git-for-each-ref.txt
index 901faef..774cecc 100644
--- a/git-for-each-ref.txt
+++ b/git-for-each-ref.txt
@@ -128,13 +128,18 @@
objectsize::
The size of the object (the same as 'git cat-file -s' reports).
-
+ Append `:disk` to get the size, in bytes, that the object takes up on
+ disk. See the note about on-disk sizes in the `CAVEATS` section below.
objectname::
The object name (aka SHA-1).
For a non-ambiguous abbreviation of the object name append `:short`.
For an abbreviation of the object name with desired length append
`:short=<length>`, where the minimum length is MINIMUM_ABBREV. The
length may be exceeded to ensure unique object names.
+deltabase::
+ This expands to the object name of the delta base for the
+ given object, if it is stored as a delta. Otherwise it
+ expands to the null object name (all zeroes).
upstream::
The name of a local ref which can be considered ``upstream''
@@ -361,6 +366,20 @@
git for-each-ref --format="%(refname)%(if)%(authorname)%(then) Authored by: %(authorname)%(end)"
------------
+CAVEATS
+-------
+
+Note that the sizes of objects on disk are reported accurately, but care
+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 or delta base
+will be reported.
+
SEE ALSO
--------
linkgit:git-show-ref[1]
diff --git a/git-format-patch.html b/git-format-patch.html
index 0a150df..5888862 100644
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -2360,7 +2360,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2018-12-01 23:35:58 JST
+ 2018-12-01 06:35:58 PST
</div>
</div>
</body>
diff --git a/git-gc.html b/git-gc.html
index 3f09add..1298cae 100644
--- a/git-gc.html
+++ b/git-gc.html
@@ -909,7 +909,7 @@
<em>git gc</em> runs <em>git pack-refs</em>. This can be set to "notbare" to enable
it within all non-bare repos or it can be set to a boolean value.
This defaults to true.</p></div>
-<div class="paragraph"><p>The optional configuration variable <code>gc.commitGraph</code> determines if
+<div class="paragraph"><p>The optional configuration variable <code>gc.writeCommitGraph</code> determines if
<em>git gc</em> should run <em>git commit-graph write</em>. This can be set to a
boolean value. This defaults to false.</p></div>
<div class="paragraph"><p>The optional configuration variable <code>gc.aggressiveWindow</code> controls how
@@ -995,7 +995,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2018-10-26 15:36:57 JST
+ 2019-01-18 15:15:21 PST
</div>
</div>
</body>
diff --git a/git-gc.txt b/git-gc.txt
index c20ee6c..a744249 100644
--- a/git-gc.txt
+++ b/git-gc.txt
@@ -137,7 +137,7 @@
it within all non-bare repos or it can be set to a boolean value.
This defaults to true.
-The optional configuration variable `gc.commitGraph` determines if
+The optional configuration variable `gc.writeCommitGraph` determines if
'git gc' should run 'git commit-graph write'. This can be set to a
boolean value. This defaults to false.
diff --git a/git-init.html b/git-init.html
index 97efd51..748eb1f 100644
--- a/git-init.html
+++ b/git-init.html
@@ -778,8 +778,6 @@
<div class="sect1">
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<div class="openblock">
-<div class="content">
<div class="dlist"><dl>
<dt class="hdlist1">
-q
@@ -890,7 +888,6 @@
into it.</p></div>
<div class="paragraph"><p>If you provide a <em>directory</em>, the command is run inside it. If this directory
does not exist, it will be created.</p></div>
-</div></div>
</div>
</div>
<div class="sect1">
@@ -975,7 +972,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2018-01-27 08:11:04 JST
+ 2019-01-18 15:15:21 PST
</div>
</div>
</body>
diff --git a/git-init.txt b/git-init.txt
index 3c5a67f..057076c 100644
--- a/git-init.txt
+++ b/git-init.txt
@@ -38,8 +38,6 @@
OPTIONS
-------
---
-
-q::
--quiet::
@@ -111,8 +109,6 @@
If you provide a 'directory', the command is run inside it. If this directory
does not exist, it will be created.
---
-
TEMPLATE DIRECTORY
------------------
diff --git a/git-log.html b/git-log.html
index dd07918..6bd0500 100644
--- a/git-log.html
+++ b/git-log.html
@@ -941,8 +941,6 @@
has a line that matches <code><pattern></code>), unless otherwise noted.</p></div>
<div class="paragraph"><p>Note that these are applied before commit
ordering and formatting options, such as <code>--reverse</code>.</p></div>
-<div class="openblock">
-<div class="content">
<div class="dlist"><dl>
<dt class="hdlist1">
-<number>
@@ -1431,7 +1429,6 @@
</p>
</dd>
</dl></div>
-</div></div>
</div>
<div class="sect2">
<h3 id="_history_simplification">History Simplification</h3>
@@ -3658,6 +3655,7 @@
came into being: use the feature iteratively to feed the interesting
block in the preimage back into <code>-S</code>, and keep going until you get the
very first version of the block.</p></div>
+<div class="paragraph"><p>Binary files are searched as well.</p></div>
</dd>
<dt class="hdlist1">
-G<regex>
@@ -3679,6 +3677,8 @@
<div class="paragraph"><p>While <code>git log -G"regexec\(regexp"</code> will show this commit, <code>git log
-S"regexec\(regexp" --pickaxe-regex</code> will not (because the number of
occurrences of that string did not change).</p></div>
+<div class="paragraph"><p>Unless <code>--text</code> is supplied patches of binary files without a textconv
+filter will be ignored.</p></div>
<div class="paragraph"><p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
information.</p></div>
</dd>
@@ -4483,7 +4483,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2018-05-08 16:51:20 JST
+ 2018-05-08 00:51:20 PDT
</div>
</div>
</body>
diff --git a/git-quiltimport.html b/git-quiltimport.html
index 91cf041..bc2a902 100644
--- a/git-quiltimport.html
+++ b/git-quiltimport.html
@@ -750,7 +750,7 @@
<div class="sectionbody">
<div class="verseblock">
<pre class="content"><em>git quiltimport</em> [--dry-run | -n] [--author <author>] [--patches <dir>]
- [--series <file>]</pre>
+ [--series <file>] [--keep-non-patch]</pre>
<div class="attribution">
</div></div>
</div>
@@ -819,6 +819,14 @@
or the value of the <code>$QUILT_SERIES</code> environment
variable.</p></div>
</dd>
+<dt class="hdlist1">
+--keep-non-patch
+</dt>
+<dd>
+<p>
+ Pass <code>-b</code> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).
+</p>
+</dd>
</dl></div>
</div>
</div>
@@ -833,7 +841,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2018-01-27 08:11:04 JST
+ 2019-01-18 15:15:21 PST
</div>
</div>
</body>
diff --git a/git-quiltimport.txt b/git-quiltimport.txt
index 8cf952b..70562dc 100644
--- a/git-quiltimport.txt
+++ b/git-quiltimport.txt
@@ -10,7 +10,7 @@
--------
[verse]
'git quiltimport' [--dry-run | -n] [--author <author>] [--patches <dir>]
- [--series <file>]
+ [--series <file>] [--keep-non-patch]
DESCRIPTION
@@ -56,6 +56,9 @@
or the value of the `$QUILT_SERIES` environment
variable.
+--keep-non-patch::
+ Pass `-b` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
+
GIT
---
Part of the linkgit:git[1] suite
diff --git a/git-rebase.html b/git-rebase.html
index 31d6e07..654745e 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -1682,8 +1682,9 @@
</div>
<div class="sect2">
<h3 id="_directory_rename_detection">Directory rename detection</h3>
-<div class="paragraph"><p>The merge and interactive backends work fine with
-directory rename detection. The am backend sometimes does not.</p></div>
+<div class="paragraph"><p>Directory rename heuristics are enabled in the merge and interactive
+backends. Due to the lack of accurate tree information, directory
+rename detection is disabled in the am backend.</p></div>
</div>
</div>
</div>
@@ -2375,7 +2376,7 @@
when the merge operation did not even start), it is rescheduled immediately.</p></div>
<div class="paragraph"><p>At this time, the <code>merge</code> command will <strong>always</strong> use the <code>recursive</code>
merge strategy for regular merges, and <code>octopus</code> for octopus merges,
-strategy, with no way to choose a different one. To work around
+with no way to choose a different one. To work around
this, an <code>exec</code> command can be used to call <code>git merge</code> explicitly,
using the fact that the labels are worktree-local refs (the ref
<code>refs/rewritten/onto</code> would correspond to the label <code>onto</code>, for example).</p></div>
@@ -2458,7 +2459,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2018-12-09 13:56:31 JST
+ 2019-01-18 15:15:21 PST
</div>
</div>
</body>
diff --git a/git-rebase.txt b/git-rebase.txt
index dff17b3..d284155 100644
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -570,8 +570,9 @@
Directory rename detection
~~~~~~~~~~~~~~~~~~~~~~~~~~
-The merge and interactive backends work fine with
-directory rename detection. The am backend sometimes does not.
+Directory rename heuristics are enabled in the merge and interactive
+backends. Due to the lack of accurate tree information, directory
+rename detection is disabled in the am backend.
include::merge-strategies.txt[]
@@ -979,7 +980,7 @@
At this time, the `merge` command will *always* use the `recursive`
merge strategy for regular merges, and `octopus` for octopus merges,
-strategy, with no way to choose a different one. To work around
+with no way to choose a different one. To work around
this, an `exec` command can be used to call `git merge` explicitly,
using the fact that the labels are worktree-local refs (the ref
`refs/rewritten/onto` would correspond to the label `onto`, for example).
diff --git a/git-rev-list.html b/git-rev-list.html
index 666183e..5dedc09 100644
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -862,8 +862,6 @@
has a line that matches <code><pattern></code>), unless otherwise noted.</p></div>
<div class="paragraph"><p>Note that these are applied before commit
ordering and formatting options, such as <code>--reverse</code>.</p></div>
-<div class="openblock">
-<div class="content">
<div class="dlist"><dl>
<dt class="hdlist1">
-<number>
@@ -1381,7 +1379,6 @@
</p>
</dd>
</dl></div>
-</div></div>
</div>
<div class="sect2">
<h3 id="_history_simplification">History Simplification</h3>
@@ -2918,7 +2915,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2018-01-27 08:11:04 JST
+ 2018-01-26 15:11:04 PST
</div>
</div>
</body>
diff --git a/git-show-ref.html b/git-show-ref.html
index 0fe6180..c9a24d4 100644
--- a/git-show-ref.html
+++ b/git-show-ref.html
@@ -785,10 +785,10 @@
</p>
</dd>
<dt class="hdlist1">
---tags
+--heads
</dt>
<dt class="hdlist1">
---heads
+--tags
</dt>
<dd>
<p>
@@ -977,7 +977,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2018-05-23 16:06:29 JST
+ 2019-01-18 15:15:21 PST
</div>
</div>
</body>
diff --git a/git-show-ref.txt b/git-show-ref.txt
index d28e615..ab4d271 100644
--- a/git-show-ref.txt
+++ b/git-show-ref.txt
@@ -37,8 +37,8 @@
Show the HEAD reference, even if it would normally be filtered out.
---tags::
--heads::
+--tags::
Limit to "refs/heads" and "refs/tags", respectively. These options
are not mutually exclusive; when given both, references stored in
diff --git a/git-show.html b/git-show.html
index 2fe54b6..2187a3a 100644
--- a/git-show.html
+++ b/git-show.html
@@ -2329,6 +2329,7 @@
came into being: use the feature iteratively to feed the interesting
block in the preimage back into <code>-S</code>, and keep going until you get the
very first version of the block.</p></div>
+<div class="paragraph"><p>Binary files are searched as well.</p></div>
</dd>
<dt class="hdlist1">
-G<regex>
@@ -2350,6 +2351,8 @@
<div class="paragraph"><p>While <code>git log -G"regexec\(regexp"</code> will show this commit, <code>git log
-S"regexec\(regexp" --pickaxe-regex</code> will not (because the number of
occurrences of that string did not change).</p></div>
+<div class="paragraph"><p>Unless <code>--text</code> is supplied patches of binary files without a textconv
+filter will be ignored.</p></div>
<div class="paragraph"><p>See the <em>pickaxe</em> entry in <a href="gitdiffcore.html">gitdiffcore(7)</a> for more
information.</p></div>
</dd>
@@ -3010,7 +3013,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2018-06-01 16:13:01 JST
+ 2018-06-01 00:13:01 PDT
</div>
</div>
</body>
diff --git a/git-status.html b/git-status.html
index 686e024..cad4e14 100644
--- a/git-status.html
+++ b/git-status.html
@@ -1323,7 +1323,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2018-07-19 05:16:04 JST
+ 2019-01-18 15:15:21 PST
</div>
</div>
</body>
diff --git a/git-status.txt b/git-status.txt
index d9f422d..861d821 100644
--- a/git-status.txt
+++ b/git-status.txt
@@ -197,31 +197,33 @@
Ignored files are not listed, unless `--ignored` option is in effect,
in which case `XY` are `!!`.
- X Y Meaning
- -------------------------------------------------
- [AMD] not updated
- M [ MD] updated in index
- A [ MD] added to index
- D deleted from index
- R [ MD] renamed in index
- C [ MD] copied in index
- [MARC] index and work tree matches
- [ MARC] M work tree changed since index
- [ MARC] D deleted in work tree
- [ D] R renamed in work tree
- [ D] C copied in work tree
- -------------------------------------------------
- D D unmerged, both deleted
- A U unmerged, added by us
- U D unmerged, deleted by them
- U A unmerged, added by them
- D U unmerged, deleted by us
- A A unmerged, both added
- U U unmerged, both modified
- -------------------------------------------------
- ? ? untracked
- ! ! ignored
- -------------------------------------------------
+....
+X Y Meaning
+-------------------------------------------------
+ [AMD] not updated
+M [ MD] updated in index
+A [ MD] added to index
+D deleted from index
+R [ MD] renamed in index
+C [ MD] copied in index
+[MARC] index and work tree matches
+[ MARC] M work tree changed since index
+[ MARC] D deleted in work tree
+[ D] R renamed in work tree
+[ D] C copied in work tree
+-------------------------------------------------
+D D unmerged, both deleted
+A U unmerged, added by us
+U D unmerged, deleted by them
+U A unmerged, added by them
+D U unmerged, deleted by us
+A A unmerged, both added
+U U unmerged, both modified
+-------------------------------------------------
+? ? untracked
+! ! ignored
+-------------------------------------------------
+....
Submodules have more state and instead report
M the submodule has a different HEAD than
@@ -281,14 +283,16 @@
If `--branch` is given, a series of header lines are printed with
information about the current branch.
- Line Notes
- ------------------------------------------------------------
- # branch.oid <commit> | (initial) Current commit.
- # branch.head <branch> | (detached) Current branch.
- # branch.upstream <upstream_branch> If upstream is set.
- # branch.ab +<ahead> -<behind> If upstream is set and
- the commit is present.
- ------------------------------------------------------------
+....
+Line Notes
+------------------------------------------------------------
+# branch.oid <commit> | (initial) Current commit.
+# branch.head <branch> | (detached) Current branch.
+# branch.upstream <upstream_branch> If upstream is set.
+# branch.ab +<ahead> -<behind> If upstream is set and
+ the commit is present.
+------------------------------------------------------------
+....
### Changed Tracked Entries
@@ -306,56 +310,60 @@
2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>
- Field Meaning
- --------------------------------------------------------
- <XY> A 2 character field containing the staged and
- unstaged XY values described in the short format,
- with unchanged indicated by a "." rather than
- a space.
- <sub> A 4 character field describing the submodule state.
- "N..." when the entry is not a submodule.
- "S<c><m><u>" when the entry is a submodule.
- <c> is "C" if the commit changed; otherwise ".".
- <m> is "M" if it has tracked changes; otherwise ".".
- <u> is "U" if there are untracked changes; otherwise ".".
- <mH> The octal file mode in HEAD.
- <mI> The octal file mode in the index.
- <mW> The octal file mode in the worktree.
- <hH> The object name in HEAD.
- <hI> The object name in the index.
- <X><score> The rename or copy score (denoting the percentage
- of similarity between the source and target of the
- move or copy). For example "R100" or "C75".
- <path> The pathname. In a renamed/copied entry, this
- is the target path.
- <sep> When the `-z` option is used, the 2 pathnames are separated
- with a NUL (ASCII 0x00) byte; otherwise, a tab (ASCII 0x09)
- byte separates them.
- <origPath> The pathname in the commit at HEAD or in the index.
- This is only present in a renamed/copied entry, and
- tells where the renamed/copied contents came from.
- --------------------------------------------------------
+....
+Field Meaning
+--------------------------------------------------------
+<XY> A 2 character field containing the staged and
+ unstaged XY values described in the short format,
+ with unchanged indicated by a "." rather than
+ a space.
+<sub> A 4 character field describing the submodule state.
+ "N..." when the entry is not a submodule.
+ "S<c><m><u>" when the entry is a submodule.
+ <c> is "C" if the commit changed; otherwise ".".
+ <m> is "M" if it has tracked changes; otherwise ".".
+ <u> is "U" if there are untracked changes; otherwise ".".
+<mH> The octal file mode in HEAD.
+<mI> The octal file mode in the index.
+<mW> The octal file mode in the worktree.
+<hH> The object name in HEAD.
+<hI> The object name in the index.
+<X><score> The rename or copy score (denoting the percentage
+ of similarity between the source and target of the
+ move or copy). For example "R100" or "C75".
+<path> The pathname. In a renamed/copied entry, this
+ is the target path.
+<sep> When the `-z` option is used, the 2 pathnames are separated
+ with a NUL (ASCII 0x00) byte; otherwise, a tab (ASCII 0x09)
+ byte separates them.
+<origPath> The pathname in the commit at HEAD or in the index.
+ This is only present in a renamed/copied entry, and
+ tells where the renamed/copied contents came from.
+--------------------------------------------------------
+....
Unmerged entries have the following format; the first character is
a "u" to distinguish from ordinary changed entries.
u <xy> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>
- Field Meaning
- --------------------------------------------------------
- <XY> A 2 character field describing the conflict type
- as described in the short format.
- <sub> A 4 character field describing the submodule state
- as described above.
- <m1> The octal file mode in stage 1.
- <m2> The octal file mode in stage 2.
- <m3> The octal file mode in stage 3.
- <mW> The octal file mode in the worktree.
- <h1> The object name in stage 1.
- <h2> The object name in stage 2.
- <h3> The object name in stage 3.
- <path> The pathname.
- --------------------------------------------------------
+....
+Field Meaning
+--------------------------------------------------------
+<XY> A 2 character field describing the conflict type
+ as described in the short format.
+<sub> A 4 character field describing the submodule state
+ as described above.
+<m1> The octal file mode in stage 1.
+<m2> The octal file mode in stage 2.
+<m3> The octal file mode in stage 3.
+<mW> The octal file mode in the worktree.
+<h1> The object name in stage 1.
+<h2> The object name in stage 2.
+<h3> The object name in stage 3.
+<path> The pathname.
+--------------------------------------------------------
+....
### Other Items
diff --git a/gitdiffcore.html b/gitdiffcore.html
index 644fcf5..28ffc38 100644
--- a/gitdiffcore.html
+++ b/gitdiffcore.html
@@ -1008,7 +1008,8 @@
regular expression. This means that it will detect in-file (or what
rename-detection considers the same file) moves, which is noise. The
implementation runs diff twice and greps, and this can be quite
-expensive.</p></div>
+expensive. To speed things up binary files without textconv filters
+will be ignored.</p></div>
<div class="paragraph"><p>When <code>-S</code> or <code>-G</code> are used without <code>--pickaxe-all</code>, only filepairs
that match their respective criterion are kept in the output. When
<code>--pickaxe-all</code> is used, if even one filepair matches their respective
@@ -1064,7 +1065,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2018-01-27 08:11:04 JST
+ 2019-01-18 15:15:21 PST
</div>
</div>
</body>
diff --git a/gitdiffcore.txt b/gitdiffcore.txt
index c0a60f3..c970d9f 100644
--- a/gitdiffcore.txt
+++ b/gitdiffcore.txt
@@ -242,7 +242,8 @@
regular expression. This means that it will detect in-file (or what
rename-detection considers the same file) moves, which is noise. The
implementation runs diff twice and greps, and this can be quite
-expensive.
+expensive. To speed things up binary files without textconv filters
+will be ignored.
When `-S` or `-G` are used without `--pickaxe-all`, only filepairs
that match their respective criterion are kept in the output. When
diff --git a/gitglossary.html b/gitglossary.html
index f053830..9958a99 100644
--- a/gitglossary.html
+++ b/gitglossary.html
@@ -1436,6 +1436,8 @@
"<code>!ATTR</code>" requires that the attribute <code>ATTR</code> be
unspecified.
</p>
+<div class="paragraph"><p>Note that when matching against a tree object, attributes are still
+obtained from working tree, not from the given tree object.</p></div>
</li>
</ul></div>
</dd>
@@ -1905,7 +1907,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2018-01-27 08:11:04 JST
+ 2018-01-26 15:11:04 PST
</div>
</div>
</body>
diff --git a/gitweb.conf.html b/gitweb.conf.html
index 340d1ee..ead4d91 100644
--- a/gitweb.conf.html
+++ b/gitweb.conf.html
@@ -963,8 +963,8 @@
<dd>
<p>
Only allow viewing of repositories also shown on the overview page.
- This for example makes <code>$gitweb_export_ok</code> file decide if repository is
- available and not only if it is shown. If <code>$gitweb_list</code> points to
+ This for example makes <code>$export_ok</code> file decide if repository is
+ available and not only if it is shown. If <code>$projects_list</code> points to
file with list of project, only those repositories listed would be
available for gitweb. Can be set during building gitweb via
<code>GITWEB_STRICT_EXPORT</code>. By default this variable is not set, which
@@ -1619,7 +1619,7 @@
compressed tar archive) and "zip"; please consult gitweb sources for
a definitive list. By default only "tgz" is offered.</p></div>
<div class="paragraph"><p>This feature can be configured on a per-repository basis via
-repository’s <code>gitweb.blame</code> configuration variable, which contains
+repository’s <code>gitweb.snapshot</code> configuration variable, which contains
a comma separated list of formats or "none" to disable snapshots.
Unknown values are ignored.</p></div>
</dd>
@@ -1999,7 +1999,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2018-10-30 16:33:48 JST
+ 2019-01-18 15:15:21 PST
</div>
</div>
</body>
diff --git a/gitweb.conf.txt b/gitweb.conf.txt
index c0a326e..92535db 100644
--- a/gitweb.conf.txt
+++ b/gitweb.conf.txt
@@ -207,8 +207,8 @@
$strict_export::
Only allow viewing of repositories also shown on the overview page.
- This for example makes `$gitweb_export_ok` file decide if repository is
- available and not only if it is shown. If `$gitweb_list` points to
+ This for example makes `$export_ok` file decide if repository is
+ available and not only if it is shown. If `$projects_list` points to
file with list of project, only those repositories listed would be
available for gitweb. Can be set during building gitweb via
`GITWEB_STRICT_EXPORT`. By default this variable is not set, which
@@ -684,7 +684,7 @@
a definitive list. By default only "tgz" is offered.
+
This feature can be configured on a per-repository basis via
-repository's `gitweb.blame` configuration variable, which contains
+repository's `gitweb.snapshot` configuration variable, which contains
a comma separated list of formats or "none" to disable snapshots.
Unknown values are ignored.
diff --git a/glossary-content.txt b/glossary-content.txt
index 0d2aa48..023ca95 100644
--- a/glossary-content.txt
+++ b/glossary-content.txt
@@ -404,6 +404,8 @@
- "`!ATTR`" requires that the attribute `ATTR` be
unspecified.
+
+Note that when matching against a tree object, attributes are still
+obtained from working tree, not from the given tree object.
exclude;;
After a path matches any non-exclude pathspec, it will be run
diff --git a/rev-list-options.txt b/rev-list-options.txt
index bab5f50..98b538b 100644
--- a/rev-list-options.txt
+++ b/rev-list-options.txt
@@ -13,8 +13,6 @@
Note that these are applied before commit
ordering and formatting options, such as `--reverse`.
---
-
-<number>::
-n <number>::
--max-count=<number>::
@@ -308,8 +306,6 @@
`<header>` text will be printed with each progress update.
endif::git-rev-list[]
---
-
History Simplification
~~~~~~~~~~~~~~~~~~~~~~
diff --git a/user-manual.html b/user-manual.html
index cc90f44..565f6de 100644
--- a/user-manual.html
+++ b/user-manual.html
@@ -2374,10 +2374,11 @@
</li><li class="listitem">
"<code class="literal">ATTR=VALUE</code>" requires that the attribute <code class="literal">ATTR</code> be
set to the string <code class="literal">VALUE</code>.
-</li><li class="listitem">
+</li><li class="listitem"><p class="simpara">
"<code class="literal">!ATTR</code>" requires that the attribute <code class="literal">ATTR</code> be
unspecified.
-</li></ul></div></dd><dt><span class="term">
+</p><p class="simpara">Note that when matching against a tree object, attributes are still
+obtained from working tree, not from the given tree object.</p></li></ul></div></dd><dt><span class="term">
exclude
</span></dt><dd>
After a path matches any non-exclude pathspec, it will be run
