Autogenerated HTML docs for v1.7.5.3-485-g090a1

gitster · May 31, 2011 · ef5a2f9 · ef5a2f9
1 parent 084228c
commit ef5a2f9
Show file tree

Hide file tree

Showing 16 changed files with 156 additions and 53 deletions.
diff --git a/RelNotes/1.7.5.4.txt b/RelNotes/1.7.5.4.txt
@@ -0,0 +1,18 @@
+Git v1.7.5.4 Release Notes
+==========================
+
+Fixes since v1.7.5.3
+--------------------
+
+ * The single-key mode of "git add -p" was easily fooled into thinking
+   that it was told to add everthing ('a') when up-arrow was pressed by
+   mistake.
+
+ * "git diff -C -C" used to disable the rename detection entirely when
+   there are too many copy candidate paths in the tree; now it falls
+   back to "-C" when doing so would keep the copy candidate paths
+   under the rename detection limit.
+
+ * "git rerere" did not diagnose a corrupt MERGE_RR file in some cases.
+
+And other minor fixes and documentation updates.
diff --git a/RelNotes/1.7.6.txt b/RelNotes/1.7.6.txt
@@ -53,11 +53,6 @@ Updates since v1.7.5
  * "git commit" learned a "--patch" option to directly jump to the
    per-hunk selection UI of the interactive mode.
 
- * "git diff -C -C" used to disable the rename detection entirely when
-   there are too many copy candidate paths in the tree; now it falls
-   back to "-C" when doing so would keep the copy candidate paths
-   under the rename detection limit.
-
  * "git diff" and its family of commands learned --dirstat=0 to show
    directories that contribute less than 0.1% of changes.
 
@@ -72,6 +67,8 @@ Updates since v1.7.5
    characters in it, e.g. "Junio C. Hamano" <jch@example.com>.  Earlier
    it was up to the user to do this when using its output.
 
+ * "git format-patch" can take an empty --subject-prefix now.
+
  * "git log" and friends learned a new "--notes" option to replace the
    "--show-notes" option.  Unlike "--show-notes", "--notes=<ref>" does
    not imply showing the default notes.
@@ -93,9 +90,20 @@ Updates since v1.7.5
 
  * p4-import (from contrib) learned a new option --preserve-user.
 
+ * "git read-tree -m" learned "--dry-run" option that reports if a merge
+   would fail without touching the index nor the working tree.
+
  * "git rebase" that does not specify on top of which branch to rebase
    the current branch now uses @{upstream} of the current branch.
 
+ * "git rebase" finished either normally or with --abort did not
+   update the reflog for HEAD to record the event to come back to
+   where it started from.
+
+ * "git remote add -t only-this-branch --mirror=fetch" is now allowed. Earlier
+   a fetch-mode mirror meant mirror everything, but now it only means refs are
+   not renamed.
+
  * "git rev-list --count" used with "--cherry-mark" counts the cherry-picked
    commits separately, producing more a useful output.
 
@@ -116,11 +124,6 @@ Fixes since v1.7.5
 Unless otherwise noted, all the fixes in 1.7.5.X maintenance track are
 included in this release.
 
- * The single-key mode of "git add -p" was easily fooled into thinking
-   that it was told to add everthing ('a') when up-arrow was pressed by
-   mistake.
-   (merge tr/add-i-no-escape later)
-
  * "git config" used to choke with an insanely long line.
    (merge ef/maint-strbuf-init later)
 

diff --git a/git-cvsserver.html b/git-cvsserver.html
@@ -685,7 +685,7 @@ <h2 id="dbbackend">Database Backend</h2>
 <h3 id="_configuring_database_backend">Configuring database backend</h3><div style="clear:left"></div>
 <div class="paragraph"><p><em>git-cvsserver</em> uses the Perl DBI module. Please also read
 its documentation if changing these variables, especially
-about <tt>DBI&#8594;connect()</tt>.</p></div>
+about <tt>DBI-&gt;connect()</tt>.</p></div>
 <div class="dlist"><dl>
 <dt class="hdlist1">
 gitcvs.dbname
@@ -905,7 +905,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-03-15 23:30:13 UTC
+Last updated 2011-05-31 19:53:01 UTC
 </div>
 </div>
 </body>

diff --git a/git-cvsserver.txt b/git-cvsserver.txt
@@ -252,7 +252,7 @@ Configuring database backend
 
 'git-cvsserver' uses the Perl DBI module. Please also read
 its documentation if changing these variables, especially
-about `DBI->connect()`.
+about `DBI\->connect()`.
 
 gitcvs.dbname::
 	Database name. The exact meaning depends on the

diff --git a/git-diff-index.html b/git-diff-index.html
@@ -1774,8 +1774,8 @@ <h2 id="_non_cached_mode">Non-cached Mode</h2>
 "object" associated with the new state, and you get:</p></div>
 <div class="literalblock">
 <div class="content">
-<pre><tt>torvalds@ppc970:~/v2.6/linux&gt; git diff-index HEAD
+<pre><tt>torvalds@ppc970:~/v2.6/linux&gt; git diff-index --abbrev HEAD
-*100644-&gt;100664 blob    7476bb......-&gt;000000......      kernel/sched.c</tt></pre>
+:100644 100664 7476bb... 000000...      kernel/sched.c</tt></pre>
 </div></div>
 <div class="paragraph"><p>i.e., it shows that the tree has changed, and that <tt>kernel/sched.c</tt> has is
 not up-to-date and may contain new stuff. The all-zero sha1 means that to
@@ -1812,7 +1812,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-03-15 23:30:13 UTC
+Last updated 2011-05-31 19:53:01 UTC
 </div>
 </div>
 </body>

diff --git a/git-diff-index.txt b/git-diff-index.txt
@@ -96,8 +96,8 @@ show that. So let's say that you have edited `kernel/sched.c`, but
 have not actually done a 'git update-index' on it yet - there is no
 "object" associated with the new state, and you get:
 
-  torvalds@ppc970:~/v2.6/linux> git diff-index HEAD
+  torvalds@ppc970:~/v2.6/linux> git diff-index --abbrev HEAD
-  *100644->100664 blob    7476bb......->000000......      kernel/sched.c
+  :100644 100664 7476bb... 000000...      kernel/sched.c
 
 i.e., it shows that the tree has changed, and that `kernel/sched.c` has is
 not up-to-date and may contain new stuff. The all-zero sha1 means that to

diff --git a/git-diff-tree.html b/git-diff-tree.html
@@ -1834,8 +1834,8 @@ <h2 id="_limiting_output">Limiting Output</h2>
 <div class="paragraph"><p>An example of normal usage is:</p></div>
 <div class="literalblock">
 <div class="content">
-<pre><tt>torvalds@ppc970:~/git&gt; git diff-tree 5319e4......
+<pre><tt>torvalds@ppc970:~/git&gt; git diff-tree --abbrev 5319e4
-*100664-&gt;100664 blob    ac348b.......-&gt;a01513.......      git-fsck-objects.c</tt></pre>
+:100664 100664 ac348b... a01513...    git-fsck-objects.c</tt></pre>
 </div></div>
 <div class="paragraph"><p>which tells you that the last commit changed just one file (it&#8217;s from
 this one:</p></div>
@@ -2415,7 +2415,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-03-15 23:30:13 UTC
+Last updated 2011-05-31 19:53:01 UTC
 </div>
 </div>
 </body>

diff --git a/git-diff-tree.txt b/git-diff-tree.txt
@@ -138,8 +138,8 @@ so it can be used to name subdirectories.
 
 An example of normal usage is:
 
-  torvalds@ppc970:~/git> git diff-tree 5319e4......
+  torvalds@ppc970:~/git> git diff-tree --abbrev 5319e4
-  *100664->100664 blob    ac348b.......->a01513.......      git-fsck-objects.c
+  :100664 100664 ac348b... a01513...	git-fsck-objects.c
 
 which tells you that the last commit changed just one file (it's from
 this one:

diff --git a/git-read-tree.html b/git-read-tree.html
@@ -478,6 +478,18 @@ <h2 id="_options">OPTIONS</h2>
 </p>
 </dd>
 <dt class="hdlist1">
+-n
+</dt>
+<dt class="hdlist1">
+--dry-run
+</dt>
+<dd>
+<p>
+        Check if the command would error out, without updating the index
+        nor the files in the working tree for real.
+</p>
+</dd>
+<dt class="hdlist1">
 -v
 </dt>
 <dd>
@@ -924,7 +936,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-03-15 23:30:14 UTC
+Last updated 2011-05-31 19:53:01 UTC
 </div>
 </div>
 </body>

diff --git a/git-read-tree.txt b/git-read-tree.txt
@@ -53,6 +53,11 @@ OPTIONS
 	trees that are not directly related to the current
 	working tree status into a temporary index file.
 
+-n::
+--dry-run::
+	Check if the command would error out, without updating the index
+	nor the files in the working tree for real.
+
 -v::
 	Show the progress of checking files out.
 

diff --git a/git-remote-helpers.html b/git-remote-helpers.html
@@ -621,11 +621,11 @@ <h2 id="_capabilities">CAPABILITIES</h2>
         When using the import command, expect the source ref to have
         been written to the destination ref. The earliest applicable
         refspec takes precedence. For example
-        "refs/heads/<strong>:refs/svn/origin/branches/</strong>" means that, after an
+        "refs/heads/&#42;:refs/svn/origin/branches/&#42;" means
-        "import refs/heads/name", the script has written to
+        that, after an "import refs/heads/name", the script has written to
         refs/svn/origin/branches/name. If this capability is used at
         all, it must cover all refs reported by the list command; if
-        it is not used, it is effectively "<strong>:</strong>"
+        it is not used, it is effectively "&#42;:&#42;"
 </p>
 </dd>
 </dl></div>
@@ -729,7 +729,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-03-15 23:30:14 UTC
+Last updated 2011-05-31 19:53:01 UTC
 </div>
 </div>
 </body>

diff --git a/git-remote-helpers.txt b/git-remote-helpers.txt
@@ -181,11 +181,11 @@ CAPABILITIES
 	When using the import command, expect the source ref to have
 	been written to the destination ref. The earliest applicable
 	refspec takes precedence. For example
-	"refs/heads/*:refs/svn/origin/branches/*" means that, after an
+	"refs/heads/{asterisk}:refs/svn/origin/branches/{asterisk}" means
-	"import refs/heads/name", the script has written to
+	that, after an "import refs/heads/name", the script has written to
 	refs/svn/origin/branches/name. If this capability is used at
 	all, it must cover all refs reported by the list command; if
-	it is not used, it is effectively "*:*"
+	it is not used, it is effectively "{asterisk}:{asterisk}"
 
 REF LIST ATTRIBUTES
 -------------------

diff --git a/git-sh-i18n--envsubst.html b/git-sh-i18n--envsubst.html
@@ -412,6 +412,18 @@ <h2>NAME</h2>
 </p>
 </div>
 </div>
+<h2 id="_synopsis">SYNOPSIS</h2>
+<div class="sectionbody">
+<div class="verseblock">
+<div class="verseblock-content">eval_gettext () {
+        printf "%s" "$1" | (
+                export PATH $(<em>git sh-i18n&#8212;envsubst</em> --variables "$1");
+                <em>git sh-i18n&#8212;envsubst</em> "$1"
+        )
+}</div>
+<div class="verseblock-attribution">
+</div></div>
+</div>
 <h2 id="_description">DESCRIPTION</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>This is not a command the end user would want to run.  Ever.
@@ -431,7 +443,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-05-23 23:05:02 UTC
+Last updated 2011-05-31 19:53:01 UTC
 </div>
 </div>
 </body>

diff --git a/git-sh-i18n--envsubst.txt b/git-sh-i18n--envsubst.txt
@@ -5,6 +5,16 @@ NAME
 ----
 git-sh-i18n--envsubst - Git's own envsubst(1) for i18n fallbacks
 
+SYNOPSIS
+--------
+[verse]
+eval_gettext () {
+	printf "%s" "$1" | (
+		export PATH $('git sh-i18n--envsubst' --variables "$1");
+		'git sh-i18n--envsubst' "$1"
+	)
+}
+
 DESCRIPTION
 -----------
 

diff --git a/git-status.html b/git-status.html
@@ -456,9 +456,10 @@ <h2 id="_options">OPTIONS</h2>
 </dt>
 <dd>
 <p>
-        Give the output in a stable, easy-to-parse format for scripts.
+        Give the output in an easy-to-parse format for scripts.
-        Currently this is identical to --short output, but is guaranteed
+        This is similar to the short output, but will remain stable
-        not to change in the future, making it safe for scripts.
+        across git versions and regardless of user configuration. See
+        below for details.
 </p>
 </dd>
 <dt class="hdlist1">
@@ -531,21 +532,23 @@ <h2 id="_output">OUTPUT</h2>
 <div class="paragraph"><p>The output from this command is designed to be used as a commit
 template comment, and all the output lines are prefixed with <em>#</em>.
 The default, long format, is designed to be human readable,
-verbose and descriptive.  They are subject to change in any time.</p></div>
+verbose and descriptive.  Its contents and format are subject to change
+at any time.</p></div>
 <div class="paragraph"><p>The paths mentioned in the output, unlike many other git commands, are
 made relative to the current directory if you are working in a
 subdirectory (this is on purpose, to help cutting and pasting). See
 the status.relativePaths config option below.</p></div>
-<div class="paragraph"><p>In short-format, the status of each path is shown as</p></div>
+<h3 id="_short_format">Short Format</h3><div style="clear:left"></div>
+<div class="paragraph"><p>In the short-format, the status of each path is shown as</p></div>
 <div class="literalblock">
 <div class="content">
 <pre><tt>XY PATH1 -&gt; PATH2</tt></pre>
 </div></div>
-<div class="paragraph"><p>where <tt>PATH1</tt> is the path in the <tt>HEAD</tt>, and ` &#8594; PATH2` part is
+<div class="paragraph"><p>where <tt>PATH1</tt> is the path in the <tt>HEAD</tt>, and the ` -&gt; PATH2` part is
 shown only when <tt>PATH1</tt> corresponds to a different path in the
 index/worktree (i.e. the file is renamed). The <em>XY</em> is a two-letter
 status code.</p></div>
-<div class="paragraph"><p>The fields (including the <tt>&#8594;</tt>) are separated from each other by a
+<div class="paragraph"><p>The fields (including the <tt>-&gt;</tt>) are separated from each other by a
 single space. If a filename contains whitespace or other nonprintable
 characters, that field will be quoted in the manner of a C string
 literal: surrounded by ASCII double quote (34) characters, and with
@@ -620,10 +623,30 @@ <h2 id="_output">OUTPUT</h2>
 </div></div>
 <div class="paragraph"><p>If -b is used the short-format status is preceded by a line</p></div>
 <div class="paragraph"><p>## branchname tracking info</p></div>
-<div class="paragraph"><p>There is an alternate -z format recommended for machine parsing.  In
+<h3 id="_porcelain_format">Porcelain Format</h3><div style="clear:left"></div>
+<div class="paragraph"><p>The porcelain format is similar to the short format, but is guaranteed
+not to change in a backwards-incompatible way between git versions or
+based on user configuration. This makes it ideal for parsing by scripts.
+The description of the short format above also describes the porcelain
+format, with a few exceptions:</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+The user&#8217;s color.status configuration is not respected; color will
+   always be off.
+</p>
+</li>
+<li>
+<p>
+The user&#8217;s status.relativePaths configuration is not respected; paths
+   shown will always be relative to the repository root.
+</p>
+</li>
+</ol></div>
+<div class="paragraph"><p>There is also an alternate -z format recommended for machine parsing. In
 that format, the status field is the same, but some other things
-change.  First, the <em>&#8594;</em> is omitted from rename entries and the field
+change.  First, the <em>-&gt;</em> is omitted from rename entries and the field
-order is reversed (e.g <em>from &#8594; to</em> becomes <em>to from</em>). Second, a NUL
+order is reversed (e.g <em>from -&gt; to</em> becomes <em>to from</em>). Second, a NUL
 (ASCII 0) follows each filename, replacing space as a field separator
 and the terminating newline (but a space still separates the status
 field from the first filename).  Third, filenames containing special
@@ -654,7 +677,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2011-03-15 23:30:14 UTC
+Last updated 2011-05-31 19:53:01 UTC
 </div>
 </div>
 </body>