Autogenerated HTML docs for v1.6.0.4-836-gd5cb

Junio C Hamano · Junio C Hamano · commit 610d17623aa8 · 2008-11-28T06:27:13.000Z
diff --git a/RelNotes-1.6.0.4.txt b/RelNotes-1.6.0.4.txt
@@ -30,7 +30,7 @@ Fixes since v1.6.0.3
 * 'git status' incorrectly reported a submodule directory as an untracked
   directory.
 
-* 'git svn' used deprecated 'git-foo' form of subcommand invocaition.
+* 'git svn' used deprecated 'git-foo' form of subcommand invocation.
 
 * 'git update-ref -d' to remove a reference did not honor --no-deref option.
 
diff --git a/RelNotes-1.6.1.txt b/RelNotes-1.6.1.txt
@@ -55,9 +55,9 @@ on.
   to a non-zero value to accept the suggestion when git can uniquely
   guess.
 
-* The packfile machinery hopefully is more robust when dealilng with
+* The packfile machinery hopefully is more robust when dealing with
   corrupt packs if redundant objects involved in the corruption are
-  available elsehwere.
+  available elsewhere.
 
 * "git add -N path..." adds the named paths as an empty blob, so that
   subsequent "git diff" will show a diff as if they are creation events.
@@ -157,7 +157,7 @@ on.
 * "git log" learned "--source" to show what ref each commit was reached
   from.
 
-* "git log" also learned "--simplify-by-decration" to show the
+* "git log" also learned "--simplify-by-decoration" to show the
   birds-eye-view of the topology of the history.
 
 * "git log --pretty=format:" learned "%d" format element that inserts
diff --git a/config.txt b/config.txt
@@ -413,6 +413,15 @@ data writes properly, but can be useful for filesystems that do not use
 journalling (traditional UNIX filesystems) or that only journal metadata
 and not file contents (OS X's HFS+, or Linux ext3 with "data=writeback").
 
+core.preloadindex::
+	Enable parallel index preload for operations like 'git diff'
++
+This can speed up operations like 'git diff' and 'git status' especially
+on filesystems like NFS that have weak caching semantics and thus
+relatively high IO latencies.  With this set to 'true', git will do the
+index comparison to the filesystem data in parallel, allowing
+overlapping IO's.
+
 alias.*::
 	Command aliases for the linkgit:git[1] command wrapper - e.g.
 	after defining "alias.last = cat-file commit HEAD", the invocation
@@ -820,7 +829,7 @@ gui.fastcopyblame::
 	repositories at the expense of less thorough copy detection.
 
 gui.copyblamethreshold::
-	Specifies the theshold to use in 'git gui blame' original location
+	Specifies the threshold to use in 'git gui blame' original location
 	detection, measured in alphanumeric characters. See the
 	linkgit:git-blame[1] manual for more information on copy detection.
 
diff --git a/git-add.html b/git-add.html
@@ -465,7 +465,7 @@ <h2 id="_options">OPTIONS</h2>
         Record only the fact that the path will be added later. An entry
         for the path is placed in the index with no content. This is
         useful for, among other things, showing the unstaged content of
-        such files with <em>git diff</em> and commiting them with <em>git commit
+        such files with <em>git diff</em> and committing them with <em>git commit
         -a</em>.
 </p>
 </dd>
@@ -701,7 +701,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2008-10-31 11:28:19 UTC
+Last updated 2008-11-28 06:26:51 UTC
 </div>
 </div>
 </body>
diff --git a/git-add.txt b/git-add.txt
@@ -98,7 +98,7 @@ OPTIONS
 	Record only the fact that the path will be added later. An entry
 	for the path is placed in the index with no content. This is
 	useful for, among other things, showing the unstaged content of
-	such files with 'git diff' and commiting them with 'git commit
+	such files with 'git diff' and committing them with 'git commit
 	-a'.
 
 --refresh::
diff --git a/git-commit.html b/git-commit.html
@@ -475,7 +475,7 @@ <h2 id="_options">OPTIONS</h2>
 </dt>
 <dd>
 <p>
-        Add Signed-off-by line by the commiter at the end of the commit
+        Add Signed-off-by line by the committer at the end of the commit
         log message.
 </p>
 </dd>
@@ -868,7 +868,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2008-11-19 02:07:45 UTC
+Last updated 2008-11-28 06:26:51 UTC
 </div>
 </div>
 </body>
diff --git a/git-commit.txt b/git-commit.txt
@@ -95,7 +95,7 @@ OPTIONS
 
 -s::
 --signoff::
-	Add Signed-off-by line by the commiter at the end of the commit
+	Add Signed-off-by line by the committer at the end of the commit
 	log message.
 
 -n::
diff --git a/git-config.html b/git-config.html
@@ -1286,6 +1286,19 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
 and not file contents (OS X's HFS+, or Linux ext3 with "data=writeback").</p></div>
 </dd>
 <dt>
+core.preloadindex
+</dt>
+<dd>
+<p>
+        Enable parallel index preload for operations like <em>git diff</em>
+</p>
+<div class="para"><p>This can speed up operations like <em>git diff</em> and <em>git status</em> especially
+on filesystems like NFS that have weak caching semantics and thus
+relatively high IO latencies.  With this set to <em>true</em>, git will do the
+index comparison to the filesystem data in parallel, allowing
+overlapping IO's.</p></div>
+</dd>
+<dt>
 alias.*
 </dt>
 <dd>
@@ -2022,7 +2035,7 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
 </dt>
 <dd>
 <p>
-        Specifies the theshold to use in <em>git gui blame</em> original location
+        Specifies the threshold to use in <em>git gui blame</em> original location
         detection, measured in alphanumeric characters. See the
         <a href="git-blame.html">git-blame(1)</a> manual for more information on copy detection.
 </p>
@@ -2903,7 +2916,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2008-11-26 22:50:09 UTC
+Last updated 2008-11-28 06:26:51 UTC
 </div>
 </div>
 </body>
diff --git a/git-merge.html b/git-merge.html
@@ -337,6 +337,28 @@ <h2 id="_options">OPTIONS</h2>
 <div class="sectionbody">
 <div class="vlist"><dl>
 <dt>
+-q
+</dt>
+<dt>
+--quiet
+</dt>
+<dd>
+<p>
+        Operate quietly.
+</p>
+</dd>
+<dt>
+-v
+</dt>
+<dt>
+--verbose
+</dt>
+<dd>
+<p>
+        Be verbose.
+</p>
+</dd>
+<dt>
 --stat
 </dt>
 <dd>
@@ -898,7 +920,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2008-11-26 22:50:09 UTC
+Last updated 2008-11-28 06:26:51 UTC
 </div>
 </div>
 </body>
diff --git a/git-pull.html b/git-pull.html
@@ -337,6 +337,28 @@ <h2 id="_options">OPTIONS</h2>
 <div class="sectionbody">
 <div class="vlist"><dl>
 <dt>
+-q
+</dt>
+<dt>
+--quiet
+</dt>
+<dd>
+<p>
+        Operate quietly.
+</p>
+</dd>
+<dt>
+-v
+</dt>
+<dt>
+--verbose
+</dt>
+<dd>
+<p>
+        Be verbose.
+</p>
+</dd>
+<dt>
 --stat
 </dt>
 <dd>
@@ -1155,7 +1177,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2008-11-14 08:26:10 UTC
+Last updated 2008-11-28 06:26:52 UTC
 </div>
 </div>
 </body>
diff --git a/git-send-email.html b/git-send-email.html
@@ -320,7 +320,7 @@ <h2>NAME</h2>
 </div>
 <h2>SYNOPSIS</h2>
 <div class="sectionbody">
-<div class="para"><p><em>git send-email</em> [options] &lt;file|directory&gt; [&#8230; file|directory]</p></div>
+<div class="para"><p><em>git send-email</em> [options] &lt;file|directory|rev-list options&gt;&#8230;</p></div>
 </div>
 <h2 id="_description">DESCRIPTION</h2>
 <div class="sectionbody">
@@ -353,13 +353,30 @@ <h3 id="_composing">Composing</h3><div style="clear:left"></div>
 <div class="para"><p>The --cc option must be repeated for each user you want on the cc list.</p></div>
 </dd>
 <dt>
+--annotate
+</dt>
+<dd>
+<p>
+        Review each patch you're about to send in an editor. The setting
+        <em>sendemail.multiedit</em> defines if this will spawn one editor per patch
+        or one for all of them at once.
+</p>
+</dd>
+<dt>
 --compose
 </dt>
 <dd>
 <p>
         Use $GIT_EDITOR, core.editor, $VISUAL, or $EDITOR to edit an
         introductory message for the patch series.
 </p>
+<div class="para"><p>When compose is in used, git send-email gets less interactive will use the
+values of the headers you set there. If the body of the email (what you type
+after the headers and a blank line) only contains blank (or GIT: prefixed)
+lines, the summary won't be sent, but git-send-email will still use the
+Headers values if you don't removed them.</p></div>
+<div class="para"><p>If it wasn't able to see a header in the summary it will ask you about it
+interactively after quitting your editor.</p></div>
 </dd>
 <dt>
 --from
@@ -603,6 +620,17 @@ <h3 id="_administering">Administering</h3><div style="clear:left"></div>
         Perform sanity checks on patches.
         Currently, validation means the following:
 </p>
+</dd>
+<dt>
+--[no-]format-patch
+</dt>
+<dd>
+<p>
+        When an argument may be understood either as a reference or as a file name,
+        choose to understand it as a format-patch argument (<em>--format-patch</em>)
+        or as a file name (<em>--no-format-patch</em>). By default, when such a conflict
+        occurs, git send-email will fail.
+</p>
 <div class="ilist"><ul>
 <li>
 <p>
@@ -637,6 +665,17 @@ <h2 id="_configuration">CONFIGURATION</h2>
         one of <em>mutt</em>, <em>mailrc</em>, <em>pine</em>, or <em>gnus</em>.
 </p>
 </dd>
+<dt>
+sendemail.multiedit
+</dt>
+<dd>
+<p>
+        If true (default), a single editor instance will be spawned to edit
+        files you have to edit (patches when <em>--annotate</em> is used, and the
+        summary when <em>--compose</em> is used). If false, files will be edited one
+        after the other, spawning a new editor each time.
+</p>
+</dd>
 </dl></div>
 </div>
 <h2 id="_author">Author</h2>
@@ -655,7 +694,7 @@ <h2 id="_git">GIT</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2008-10-31 11:28:50 UTC
+Last updated 2008-11-28 06:26:52 UTC
 </div>
 </div>
 </body>
diff --git a/git-send-email.txt b/git-send-email.txt
@@ -8,7 +8,7 @@ git-send-email - Send a collection of patches as emails
 
 SYNOPSIS
 --------
-'git send-email' [options] <file|directory> [... file|directory]
+'git send-email' [options] <file|directory|rev-list options>...
 
 
 DESCRIPTION
@@ -37,9 +37,23 @@ The --bcc option must be repeated for each user you want on the bcc list.
 +
 The --cc option must be repeated for each user you want on the cc list.
 
+--annotate::
+	Review each patch you're about to send in an editor. The setting
+	'sendemail.multiedit' defines if this will spawn one editor per patch
+	or one for all of them at once.
+
 --compose::
 	Use $GIT_EDITOR, core.editor, $VISUAL, or $EDITOR to edit an
 	introductory message for the patch series.
++
+When compose is in used, git send-email gets less interactive will use the
+values of the headers you set there. If the body of the email (what you type
+after the headers and a blank line) only contains blank (or GIT: prefixed)
+lines, the summary won't be sent, but git-send-email will still use the
+Headers values if you don't removed them.
++
+If it wasn't able to see a header in the summary it will ask you about it
+interactively after quitting your editor.
 
 --from::
 	Specify the sender of the emails.  This will default to
@@ -183,6 +197,12 @@ Administering
 --[no-]validate::
 	Perform sanity checks on patches.
 	Currently, validation means the following:
+
+--[no-]format-patch::
+	When an argument may be understood either as a reference or as a file name,
+	choose to understand it as a format-patch argument ('--format-patch')
+	or as a file name ('--no-format-patch'). By default, when such a conflict
+	occurs, git send-email will fail.
 +
 --
 		*	Warn of patches that contain lines longer than 998 characters; this
@@ -204,6 +224,12 @@ sendemail.aliasfiletype::
 	Format of the file(s) specified in sendemail.aliasesfile. Must be
 	one of 'mutt', 'mailrc', 'pine', or 'gnus'.
 
+sendemail.multiedit::
+	If true (default), a single editor instance will be spawned to edit
+	files you have to edit (patches when '--annotate' is used, and the
+	summary when '--compose' is used). If false, files will be edited one
+	after the other, spawning a new editor each time.
+
 
 Author
 ------
diff --git a/git-svn.html b/git-svn.html
@@ -507,7 +507,7 @@ <h2 id="_commands">COMMANDS</h2>
 </p>
 <div class="para"><p>This works similarly to <tt>svn update</tt> or <em>git-pull</em> except that
 it preserves linear history with <em>git-rebase</em> instead of
-<em>git-merge</em> for ease of dcommiting with <em>git-svn</em>.</p></div>
+<em>git-merge</em> for ease of dcommitting with <em>git-svn</em>.</p></div>
 <div class="para"><p>This accepts all options that <em>git-svn fetch</em> and <em>git-rebase</em>
 accept.  However, <em>--fetch-all</em> only fetches from the current
 [svn-remote], and not all [svn-remote] definitions.</p></div>
@@ -1285,7 +1285,7 @@ <h2 id="_documentation">Documentation</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2008-11-15 08:07:37 UTC
+Last updated 2008-11-28 06:26:53 UTC
 </div>
 </div>
 </body>
diff --git a/git-svn.txt b/git-svn.txt
@@ -109,7 +109,7 @@ COMMANDS
 
 This works similarly to `svn update` or 'git-pull' except that
 it preserves linear history with 'git-rebase' instead of
-'git-merge' for ease of dcommiting with 'git-svn'.
+'git-merge' for ease of dcommitting with 'git-svn'.
 
 This accepts all options that 'git-svn fetch' and 'git-rebase'
 accept.  However, '--fetch-all' only fetches from the current
diff --git a/merge-options.txt b/merge-options.txt
diff --git a/technical/api-strbuf.html b/technical/api-strbuf.html
diff --git a/technical/api-strbuf.txt b/technical/api-strbuf.txt
diff --git a/user-manual.html b/user-manual.html
diff --git a/user-manual.txt b/user-manual.txt
