Permalink
Browse files

Autogenerated HTML docs for v1.8.3-182-gb2edae

  • Loading branch information...
1 parent c710296 commit 7e590a1afe350393356fbecdd44a43a42ddfad34 @gitster committed Jun 2, 2013
View
@@ -15,15 +15,41 @@ UI, Workflows & Features
* "check-ignore" (new feature since 1.8.2) has been updated to work
more like "check-attr" over bidi-pipes.
+ * "git describe" learned "--first-parent" option to limit its closest
+ tagged commmit search to the first-parent chain.
+
+ * "git merge foo" that might have meant "git merge origin/foo" is
+ diagnosed with a more informative error message.
+
+ * "git log -L<line>,<range>:<filename>" has been added. This may
+ still have leaks and rough edges, though.
+
* We used the approxidate() parser for "--expire=<timestamp>" options
of various commands, but it is better to treat --expire=all and
--expire=now a bit more specially than using the current timestamp.
"git gc" and "git reflog" have been updated with a new parsing
function for expiry dates.
+ * Updates to completion (both bash and zsh) helpers.
+
+ * "git fetch origin master" unlike "git fetch origin" or "git fetch"
+ did not update "refs/remotes/origin/master"; this was an early
+ design decision to keep the update of remote tracking branches
+ predictable, but in practice it turns out that people find it more
+ convenient to opportunisticly update them whenever we have a
+ chance, and we have been updating them when we run "git push" which
+ already breaks the original "predictability" anyway.
+
Performance, Internal Implementation, etc.
+ * The codepath to read from marks files in fast-import/export did not
+ have to accept anything but 40-hex representation of the object
+ name. Further, fast-export did not need full in-core object
+ representation to have parsed wen reading from them. These
+ codepaths have been optimized by taking advantage of these access
+ patterns.
+
* Object lookup logic, when the object hashtable starts to become
crowded, has been optimized.
@@ -48,6 +74,33 @@ Unless otherwise noted, all the fixes since v1.8.3 in the maintenance
track are contained in this release (see release notes to them for
details).
+ * "git merge @{-1}~22" was rewritten to "git merge frotz@{1}~22"
+ incorrectly when your previous branch was "frotz" (it should be
+ rewritten to "git merge frotz~22" instead).
+ (merge 84cf246 jc/strbuf-branchname-fix later to maint).
+
+ * "git diff -c -p" was not showing a deleted line from a hunk when
+ another hunk immediately begins where the earlier one ends.
+ (merge aac3857 mk/combine-diff-context-horizon-fix later to maint).
+
+ * "git log --ancestry-path A...B" did not work as expected, as it did
+ not pay attention to the fact that the merge base between A and B
+ was the bottom of the range being specified.
+ (merge a765499 kb/ancestry-path-threedots later to maint).
+
+ * Mac OS X does not like to write(2) more than INT_MAX number of
+ bytes; work it around by chopping write(2) into smaller pieces.
+ (merge 6c642a8 fc/macos-x-clipped-write later to maint).
+
+ * Newer MacOS X encourages the programs to compile and link with
+ their CommonCrypto, not with OpenSSL.
+ (merge be4c828 da/darwin later to maint).
+
+ * "git clone foo/bar:baz" cannot be a request to clone from a remote
+ over git-over-ssh specified in the scp style. This case is now
+ detected and clones from a local repository at "foo/bar:baz".
+ (merge 6000334 nd/clone-local-with-colon later to maint).
+
* When $HOME is misconfigured to point at an unreadable directory, we
used to complain and die. Loosen the check.
(merge 4698c8f jn/config-ignore-inaccessible later to maint).
View
@@ -9,28 +9,11 @@
--show-stats::
Include additional statistics at the end of blame output.
--L <start>,<end>::
+-L <start>,<end>, -L :<regex>::
Annotate only the given line range. <start> and <end> can take
one of these forms:
- - number
-+
-If <start> or <end> is a number, it specifies an
-absolute line number (lines count from 1).
-+
-
-- /regex/
-+
-This form will use the first line matching the given
-POSIX regex. If <end> is a regex, it will search
-starting at the line given by <start>.
-+
-
-- +offset or -offset
-+
-This is only valid for <end> and will specify a number
-of lines before or after the line given by <start>.
-+
+include::line-range-format.txt[]
-l::
Show long rev (Default: off).
@@ -5,7 +5,7 @@ linkgit:git-diff-files[1]::
Compares files in the working tree and the index.
linkgit:git-diff-index[1]::
- Compares content and mode of blobs between the index and repository.
+ Compare a tree to the working tree or index.
linkgit:git-diff-tree[1]::
Compares the content and mode of blobs found via two tree objects.
View
@@ -793,7 +793,7 @@ <h2 id="_options">OPTIONS</h2>
</p>
</dd>
<dt class="hdlist1">
--L &lt;start&gt;,&lt;end&gt;
+-L &lt;start&gt;,&lt;end&gt;, -L :&lt;regex&gt;
</dt>
<dd>
<p>
@@ -823,6 +823,14 @@ <h2 id="_options">OPTIONS</h2>
<div class="paragraph"><p>This is only valid for &lt;end&gt; and will specify a number
of lines before or after the line given by &lt;start&gt;.</p></div>
</li>
+<li>
+<p>
+:regex
+</p>
+<div class="paragraph"><p>If the option&#8217;s argument is of the form :regex, it denotes the range
+from the first funcname line that matches &lt;regex&gt;, up to the next
+funcname line.</p></div>
+</li>
</ul></div>
</dd>
<dt class="hdlist1">
View
@@ -746,9 +746,9 @@
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git blame</em> [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental] [-L n,m]
- [-S &lt;revs-file&gt;] [-M] [-C] [-C] [-C] [--since=&lt;date&gt;] [--abbrev=&lt;n&gt;]
- [&lt;rev&gt; | --contents &lt;file&gt; | --reverse &lt;rev&gt;] [--] &lt;file&gt;</pre>
+<pre class="content"><em>git blame</em> [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental]
+ [-L n,m | -L :fn] [-S &lt;revs-file&gt;] [-M] [-C] [-C] [-C] [--since=&lt;date&gt;]
+ [--abbrev=&lt;n&gt;] [&lt;rev&gt; | --contents &lt;file&gt; | --reverse &lt;rev&gt;] [--] &lt;file&gt;</pre>
<div class="attribution">
</div></div>
</div>
@@ -811,7 +811,7 @@ <h2 id="_options">OPTIONS</h2>
</p>
</dd>
<dt class="hdlist1">
--L &lt;start&gt;,&lt;end&gt;
+-L &lt;start&gt;,&lt;end&gt;, -L :&lt;regex&gt;
</dt>
<dd>
<p>
@@ -841,6 +841,14 @@ <h2 id="_options">OPTIONS</h2>
<div class="paragraph"><p>This is only valid for &lt;end&gt; and will specify a number
of lines before or after the line given by &lt;start&gt;.</p></div>
</li>
+<li>
+<p>
+:regex
+</p>
+<div class="paragraph"><p>If the option&#8217;s argument is of the form :regex, it denotes the range
+from the first funcname line that matches &lt;regex&gt;, up to the next
+funcname line.</p></div>
+</li>
</ul></div>
</dd>
<dt class="hdlist1">
@@ -1364,7 +1372,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-06-02 16:46:06 PDT
</div>
</div>
</body>
View
@@ -8,9 +8,9 @@ git-blame - Show what revision and author last modified each line of a file
SYNOPSIS
--------
[verse]
-'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental] [-L n,m]
- [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>] [--abbrev=<n>]
- [<rev> | --contents <file> | --reverse <rev>] [--] <file>
+'git blame' [-c] [-b] [-l] [--root] [-t] [-f] [-n] [-s] [-e] [-p] [-w] [--incremental]
+ [-L n,m | -L :fn] [-S <revs-file>] [-M] [-C] [-C] [-C] [--since=<date>]
+ [--abbrev=<n>] [<rev> | --contents <file> | --reverse <rev>] [--] <file>
DESCRIPTION
-----------
View
@@ -1138,6 +1138,11 @@ <h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2>
</p>
</li>
</ul></div>
+<div class="paragraph"><p>This syntax is only recognized if there are no slashes before the
+first colon. This helps differentiate a local path that contains a
+colon. For example the local path <code>foo:bar</code> could be specified as an
+absolute path or <code>./foo:bar</code> to avoid being misinterpreted as an ssh
+url.</p></div>
<div class="paragraph"><p>The ssh and git protocols additionally support ~username expansion:</p></div>
<div class="ulist"><ul>
<li>
View
@@ -891,6 +891,16 @@ <h2 id="_options">OPTIONS</h2>
Show uniquely abbreviated commit object as fallback.
</p>
</dd>
+<dt class="hdlist1">
+--first-parent
+</dt>
+<dd>
+<p>
+ Follow only the first parent commit upon seeing a merge commit.
+ This is useful when you wish to not match tags on branches merged
+ in the history of the target commit.
+</p>
+</dd>
</dl></div>
</div>
</div>
@@ -958,7 +968,9 @@ <h2 id="_search_strategy">SEARCH STRATEGY</h2>
<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.</p></div>
+abbreviation of the input committish&#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
selected and output. Here fewest commits different is defined as
@@ -976,7 +988,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-04-21 19:25:38 PDT
+Last updated 2013-06-02 16:46:06 PDT
</div>
</div>
</body>
View
@@ -88,6 +88,11 @@ OPTIONS
--always::
Show uniquely abbreviated commit object as fallback.
+--first-parent::
+ Follow only the first parent commit upon seeing a merge commit.
+ This is useful when you wish to not match tags on branches merged
+ in the history of the target commit.
+
EXAMPLES
--------
@@ -149,7 +154,9 @@ 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.
+abbreviation of the input committish'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
View
@@ -737,7 +737,7 @@
<h2>NAME</h2>
<div class="sectionbody">
<p>git-diff-index -
- Compares content and mode of blobs between the index and repository
+ Compare a tree to the working tree or index
</p>
</div>
</div>
@@ -754,11 +754,11 @@ <h2 id="_synopsis">SYNOPSIS</h2>
<div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Compares the content and mode of the blobs found via a tree
-object with the content of the current index and, optionally
-ignoring the stat state of the file on disk. When paths are
-specified, compares only those named paths. Otherwise all
-entries in the index are compared.</p></div>
+<div class="paragraph"><p>Compares the content and mode of the blobs found in a tree object
+with the corresponding tracked files in the working tree, or with the
+corresponding paths in the index. When &lt;path&gt; arguments are present,
+compares only paths matching those patterns. Otherwise all tracked
+files are compared.</p></div>
</div>
</div>
<div class="sect1">
@@ -2294,7 +2294,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PST
+Last updated 2013-06-02 16:46:06 PDT
</div>
</div>
</body>
View
@@ -3,7 +3,7 @@ git-diff-index(1)
NAME
----
-git-diff-index - Compares content and mode of blobs between the index and repository
+git-diff-index - Compare a tree to the working tree or index
SYNOPSIS
@@ -13,11 +13,11 @@ SYNOPSIS
DESCRIPTION
-----------
-Compares the content and mode of the blobs found via a tree
-object with the content of the current index and, optionally
-ignoring the stat state of the file on disk. When paths are
-specified, compares only those named paths. Otherwise all
-entries in the index are compared.
+Compares the content and mode of the blobs found in a tree object
+with the corresponding tracked files in the working tree, or with the
+corresponding paths in the index. When <path> arguments are present,
+compares only paths matching those patterns. Otherwise all tracked
+files are compared.
OPTIONS
-------
View
@@ -1117,9 +1117,8 @@ <h2 id="_options">OPTIONS</h2>
</li>
<li>
<p>
-A parameter &lt;ref&gt; without a colon is equivalent to
- &lt;ref&gt;: when pulling/fetching, so it merges &lt;ref&gt; into the current
- branch without storing the remote branch anywhere locally
+A parameter &lt;ref&gt; without a colon fetches that ref into FETCH_HEAD,
+ and updates the remote-tracking branches (if any).
</p>
</li>
</ul></div>
@@ -1174,6 +1173,11 @@ <h2 id="_git_urls_a_id_urls_a">GIT URLS<a id="URLS"></a></h2>
</p>
</li>
</ul></div>
+<div class="paragraph"><p>This syntax is only recognized if there are no slashes before the
+first colon. This helps differentiate a local path that contains a
+colon. For example the local path <code>foo:bar</code> could be specified as an
+absolute path or <code>./foo:bar</code> to avoid being misinterpreted as an ssh
+url.</p></div>
<div class="paragraph"><p>The ssh and git protocols additionally support ~username expansion:</p></div>
<div class="ulist"><ul>
<li>
Oops, something went wrong.

0 comments on commit 7e590a1

Please sign in to comment.