Permalink
Browse files

Autogenerated HTML docs for v1.8.4-357-g8d83

  • Loading branch information...
1 parent 0e0e0d2 commit e6f28d0b6c239f15760194c8b12afdaa1a7bdd34 @gitster committed Sep 17, 2013
@@ -31,7 +31,7 @@ Fixes since v1.7.11.1
* "git diff --no-index" did not work with pagers correctly.
* "git diff COPYING HEAD:COPYING" gave a nonsense error message that
- claimed that the treeish HEAD did not have COPYING in it.
+ claimed that the tree-ish HEAD did not have COPYING in it.
* When "git log" gets "--simplify-merges/by-decoration" together with
"--first-parent", the combination of these options makes the
View
@@ -48,6 +48,10 @@ Updates since v1.8.4
Foreign interfaces, subsystems and ports.
+ * On MacOS X, we detected if the filesystem needs the "pre-composed
+ unicode strings" workaround, but did not automatically enable it.
+ Now we do.
+
* remote-hg remote helper misbehaved when interacting with a local Hg
repository relative to the home directory, e.g. "clone hg::~/there".
@@ -63,6 +67,12 @@ Foreign interfaces, subsystems and ports.
UI, Workflows & Features
+ * Earlier we started rejecting an attempt to add 0{40} object name to
+ the index and to tree objects, but it sometimes is necessary to
+ allow so to be able to use tools like filter-branch to correct such
+ broken tree objects. "filter-branch" can again be used to to do
+ so.
+
* "git config" did not provide a way to set or access numbers larger
than a native "int" on the platform; it now provides 64-bit signed
integers on all platforms.
@@ -155,6 +165,18 @@ Unless otherwise noted, all the fixes since v1.8.4 in the maintenance
track are contained in this release (see release notes to them for
details).
+ * When an object is not found after checking the packfiles and then
+ loose object directory, read_sha1_file() re-checks the packfiles to
+ prevent racing with a concurrent repacker; teach the same logic to
+ has_sha1_file().
+ (merge 45e8a74 jk/has-sha1-file-retry-packed later to maint).
+
+ * "git commit --author=$name", when $name is not in the canonical
+ "A. U. Thor <au.thor@example.xz>" format, looks for a matching name
+ from existing history, but did not consult mailmap to grab the
+ preferred author name.
+ (merge ea16794 ap/commit-author-mailmap later to maint).
+
* "git ls-files -k" needs to crawl only the part of the working tree
that may overlap the paths in the index to find killed files, but
shared code with the logic to find all the untracked files, which
View
@@ -170,8 +170,8 @@ advice.*::
pushNeedsForce::
Shown when linkgit:git-push[1] rejects an update that
tries to overwrite a remote ref that points at an
- object that is not a committish, or make the remote
- ref point at an object that is not a committish.
+ object that is not a commit-ish, or make the remote
+ ref point at an object that is not a commit-ish.
statusHints::
Show directions on how to proceed from the current
state in the output of linkgit:git-status[1], in
@@ -789,8 +789,8 @@ browser.<tool>.path::
working repository in gitweb (see linkgit:git-instaweb[1]).
clean.requireForce::
- A boolean to make git-clean do nothing unless given -f
- or -n. Defaults to true.
+ A boolean to make git-clean do nothing unless given -f,
+ -i or -n. Defaults to true.
color.branch::
A boolean to enable/disable color in the output of
View
@@ -1303,7 +1303,7 @@ <h2 id="_repository_administration_a_id_repository_administration_a">Repository
</p>
</li>
</ul></div>
-<div class="paragraph"><p><a href="howto/update-hook-example.txt">update hook howto</a> has a good
+<div class="paragraph"><p><a href="howto/update-hook-example.html">update hook howto</a> has a good
example of managing a shared central repository.</p></div>
<div class="sect2">
<h3 id="_examples_4">Examples</h3>
@@ -1469,7 +1469,7 @@ <h3 id="_examples_4">Examples</h3>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-20 08:40:27 PDT
+Last updated 2013-09-17 14:33:14 PDT
</div>
</div>
</body>
View
@@ -304,7 +304,7 @@ and maintain access to the repository by developers.
* linkgit:git-shell[1] can be used as a 'restricted login shell'
for shared central repository users.
-link:howto/update-hook-example.txt[update hook howto] has a good
+link:howto/update-hook-example.html[update hook howto] has a good
example of managing a shared central repository.
View
@@ -831,7 +831,7 @@ <h2 id="_options">OPTIONS</h2>
<dd>
<p>
Show the content as transformed by a textconv filter. In this case,
- &lt;object&gt; has be of the form &lt;treeish&gt;:&lt;path&gt;, or :&lt;path&gt; in order
+ &lt;object&gt; has be of the form &lt;tree-ish&gt;:&lt;path&gt;, or :&lt;path&gt; in order
to apply the filter to the content recorded in the index at &lt;path&gt;.
</p>
</dd>
@@ -981,7 +981,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-09-09 15:34:20 PDT
+Last updated 2013-09-17 14:33:14 PDT
</div>
</div>
</body>
View
@@ -54,7 +54,7 @@ OPTIONS
--textconv::
Show the content as transformed by a textconv filter. In this case,
- <object> has be of the form <treeish>:<path>, or :<path> in order
+ <object> has be of the form <tree-ish>:<path>, or :<path> in order
to apply the filter to the content recorded in the index at <path>.
--batch::
View
@@ -1538,8 +1538,8 @@ <h3 id="_variables">Variables</h3>
<p>
Shown when <a href="git-push.html">git-push(1)</a> rejects an update that
tries to overwrite a remote ref that points at an
- object that is not a committish, or make the remote
- ref point at an object that is not a committish.
+ object that is not a commit-ish, or make the remote
+ ref point at an object that is not a commit-ish.
</p>
</dd>
<dt class="hdlist1">
@@ -2490,8 +2490,8 @@ <h3 id="_variables">Variables</h3>
</dt>
<dd>
<p>
- A boolean to make git-clean do nothing unless given -f
- or -n. Defaults to true.
+ A boolean to make git-clean do nothing unless given -f,
+ -i or -n. Defaults to true.
</p>
</dd>
<dt class="hdlist1">
View
@@ -760,7 +760,7 @@ <h2 id="_description">DESCRIPTION</h2>
interface to scripts which may want to retrieve, store, or prompt for
credentials in the same manner as Git. The design of this scriptable
interface models the internal C API; see
-<a href="technical/api-credentials.txt">the Git credential API</a> for more
+<a href="technical/api-credentials.html">the Git credential API</a> for more
background on the concepts.</p></div>
<div class="paragraph"><p>git-credential takes an "action" option on the command-line (one of
<code>fill</code>, <code>approve</code>, or <code>reject</code>) and reads a credential description
@@ -934,7 +934,7 @@ <h2 id="IOFMT">INPUT/OUTPUT FORMAT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-20 08:40:27 PDT
+Last updated 2013-09-17 14:33:14 PDT
</div>
</div>
</body>
View
@@ -20,7 +20,7 @@ usernames and passwords. The git-credential command exposes this
interface to scripts which may want to retrieve, store, or prompt for
credentials in the same manner as Git. The design of this scriptable
interface models the internal C API; see
-link:technical/api-credentials.txt[the Git credential API] for more
+link:technical/api-credentials.html[the Git credential API] for more
background on the concepts.
git-credential takes an "action" option on the command-line (one of
View
@@ -746,7 +746,7 @@
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git describe</em> [--all] [--tags] [--contains] [--abbrev=&lt;n&gt;] &lt;committish&gt;&#8230;
+<pre class="content"><em>git describe</em> [--all] [--tags] [--contains] [--abbrev=&lt;n&gt;] &lt;commit-ish&gt;&#8230;
<em>git describe</em> [--all] [--tags] [--contains] [--abbrev=&lt;n&gt;] --dirty[=&lt;mark&gt;]</pre>
<div class="attribution">
</div></div>
@@ -770,11 +770,11 @@ <h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
-&lt;committish&gt;&#8230;
+&lt;commit-ish&gt;&#8230;
</dt>
<dd>
<p>
- Committish object names to describe.
+ Commit-ish object names to describe.
</p>
</dd>
<dt class="hdlist1">
@@ -834,7 +834,7 @@ <h2 id="_options">OPTIONS</h2>
<dd>
<p>
Instead of considering only the 10 most recent tags as
- candidates to describe the input committish consider
+ candidates to describe the input commit-ish consider
up to &lt;n&gt; candidates. Increasing &lt;n&gt; above 10 will take
slightly longer but may produce a more accurate result.
An &lt;n&gt; of 0 will cause only exact matches to be output.
@@ -960,19 +960,19 @@ <h2 id="_examples">EXAMPLES</h2>
<div class="sect1">
<h2 id="_search_strategy">SEARCH STRATEGY</h2>
<div class="sectionbody">
-<div class="paragraph"><p>For each committish supplied, <em>git describe</em> will first look for
+<div class="paragraph"><p>For each commit-ish supplied, <em>git describe</em> will first look for
a tag which tags exactly that commit. Annotated tags will always
be preferred over lightweight tags, and tags with newer dates will
always be preferred over tags with older dates. If an exact match
is found, its name will be output and searching will stop.</p></div>
<div class="paragraph"><p>If an exact match was not found, <em>git describe</em> will walk back
through the commit history to locate an ancestor commit which
has been tagged. The ancestor&#8217;s tag will be output along with an
-abbreviation of the input committish&#8217;s SHA-1. If <em>--first-parent</em> was
+abbreviation of the input commit-ish&#8217;s SHA-1. If <em>--first-parent</em> was
specified then the walk will only consider the first parent of each
commit.</p></div>
<div class="paragraph"><p>If multiple tags were found during the walk then the tag which
-has the fewest commits different from the input committish will be
+has the fewest commits different from the input commit-ish will be
selected and output. Here fewest commits different is defined as
the number of commits which would be shown by <code>git log tag..input</code>
will be the smallest number of commits possible.</p></div>
@@ -988,7 +988,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 2013-09-17 14:33:14 PDT
</div>
</div>
</body>
View
@@ -9,7 +9,7 @@ git-describe - Show the most recent tag that is reachable from a commit
SYNOPSIS
--------
[verse]
-'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] <committish>...
+'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] <commit-ish>...
'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]
DESCRIPTION
@@ -26,8 +26,8 @@ see the -a and -s options to linkgit:git-tag[1].
OPTIONS
-------
-<committish>...::
- Committish object names to describe.
+<commit-ish>...::
+ Commit-ish object names to describe.
--dirty[=<mark>]::
Describe the working tree.
@@ -57,7 +57,7 @@ OPTIONS
--candidates=<n>::
Instead of considering only the 10 most recent tags as
- candidates to describe the input committish consider
+ candidates to describe the input commit-ish consider
up to <n> candidates. Increasing <n> above 10 will take
slightly longer but may produce a more accurate result.
An <n> of 0 will cause only exact matches to be output.
@@ -145,7 +145,7 @@ be sufficient to disambiguate these commits.
SEARCH STRATEGY
---------------
-For each committish supplied, 'git describe' will first look for
+For each commit-ish supplied, 'git describe' will first look for
a tag which tags exactly that commit. Annotated tags will always
be preferred over lightweight tags, and tags with newer dates will
always be preferred over tags with older dates. If an exact match
@@ -154,12 +154,12 @@ is found, its name will be output and searching will stop.
If an exact match was not found, 'git describe' will walk back
through the commit history to locate an ancestor commit which
has been tagged. The ancestor's tag will be output along with an
-abbreviation of the input committish's SHA-1. If '--first-parent' was
+abbreviation of the input commit-ish's SHA-1. If '--first-parent' was
specified then the walk will only consider the first parent of each
commit.
If multiple tags were found during the walk then the tag which
-has the fewest commits different from the input committish will be
+has the fewest commits different from the input commit-ish will be
selected and output. Here fewest commits different is defined as
the number of commits which would be shown by `git log tag..input`
will be the smallest number of commits possible.
View
@@ -773,9 +773,19 @@ <h2 id="_description">DESCRIPTION</h2>
further add to the index but you still haven&#8217;t. You can
stage these changes by using <a href="git-add.html">git-add(1)</a>.
</p>
-<div class="paragraph"><p>If exactly two paths are given and at least one points outside
-the current repository, <em>git diff</em> will compare the two files /
-directories. This behavior can be forced by --no-index.</p></div>
+</dd>
+<dt class="hdlist1">
+<em>git diff</em> --no-index [--options] [--] [&lt;path&gt;&#8230;]
+</dt>
+<dd>
+<p>
+ This form is to compare the given two paths on the
+ filesystem. You can omit the <code>--no-index</code> option when
+ running the command in a working tree controlled by Git and
+ at least one of the paths points outside the working tree,
+ or when running the command outside a working tree
+ controlled by Git.
+</p>
</dd>
<dt class="hdlist1">
<em>git diff</em> [--options] --cached [&lt;commit&gt;] [--] [&lt;path&gt;&#8230;]
@@ -2476,7 +2486,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 2013-09-17 14:33:14 PDT
</div>
</div>
</body>
View
@@ -28,10 +28,15 @@ two blob objects, or changes between two files on disk.
words, the differences are what you _could_ tell Git to
further add to the index but you still haven't. You can
stage these changes by using linkgit:git-add[1].
-+
-If exactly two paths are given and at least one points outside
-the current repository, 'git diff' will compare the two files /
-directories. This behavior can be forced by --no-index.
+
+'git diff' --no-index [--options] [--] [<path>...]::
+
+ This form is to compare the given two paths on the
+ filesystem. You can omit the `--no-index` option when
+ running the command in a working tree controlled by Git and
+ at least one of the paths points outside the working tree,
+ or when running the command outside a working tree
+ controlled by Git.
'git diff' [--options] --cached [<commit>] [--] [<path>...]::
Oops, something went wrong.

0 comments on commit e6f28d0

Please sign in to comment.