Autogenerated HTML docs for v1.8.0-150-gb0b00

config.txt

@@ -538,14 +538,14 @@ core.pager::
 	`LESS` variable to some other value.  Alternately,
 	these settings can be overridden on a project or
 	global basis by setting the `core.pager` option.
-	Setting `core.pager` has no affect on the `LESS`
+	Setting `core.pager` has no effect on the `LESS`
 	environment variable behaviour above, so if you want
 	to override git's default settings this way, you need
 	to be explicit.  For example, to disable the S option
 	in a backward compatible manner, set `core.pager`
-	to `less -+$LESS -FRX`.  This will be passed to the
-	shell by git, which will translate the final command to
-	`LESS=FRSX less -+FRSX -FRX`.
+	to `less -+S`.  This will be passed to the shell by
+	git, which will translate the final command to
+	`LESS=FRSX less -+S`.
 
 core.whitespace::
 	A comma separated list of common whitespace problems to

diff-config.txt

@@ -56,6 +56,10 @@ diff.statGraphWidth::
 	Limit the width of the graph part in --stat output. If set, applies
 	to all commands generating --stat output except format-patch.
 
+diff.context::
+	Generate diffs with <n> lines of context instead of the default of
+	3. This value is overridden by the -U option.
+
 diff.external::
 	If this config variable is set, diff generation is not
 	performed using the internal diff machinery, but using the

git-clone.html

@@ -865,9 +865,9 @@ <h2 id="_options">OPTIONS</h2>
         <tt>--no-single-branch</tt> is given to fetch the histories near the
         tips of all branches.
         Further fetches into the resulting repository will only update the
-        remote tracking branch for the branch this option was used for the
+        remote-tracking branch for the branch this option was used for the
         initial cloning.  If the HEAD at the remote did not point at any
-        branch when <tt>--single-branch</tt> clone was made, no remote tracking
+        branch when <tt>--single-branch</tt> clone was made, no remote-tracking
         branch is created.
 </p>
 </dd>
@@ -1118,7 +1118,7 @@ <h2 id="_git">GIT</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2012-10-01 13:59:22 PDT
+Last updated 2012-11-13 14:31:09 PDT
 </div>
 </div>
 </body>

git-clone.txt

@@ -196,9 +196,9 @@ objects from the source repository into a pack in the cloned repository.
 	`--no-single-branch` is given to fetch the histories near the
 	tips of all branches.
 	Further fetches into the resulting repository will only update the
-	remote tracking branch for the branch this option was used for the
+	remote-tracking branch for the branch this option was used for the
 	initial cloning.  If the HEAD at the remote did not point at any
-	branch when `--single-branch` clone was made, no remote tracking
+	branch when `--single-branch` clone was made, no remote-tracking
 	branch is created.
 
 --recursive::

git-commit.html

@@ -588,7 +588,7 @@ <h2 id="_synopsis">SYNOPSIS</h2>
            [-F &lt;file&gt; | -m &lt;msg&gt;] [--reset-author] [--allow-empty]
            [--allow-empty-message] [--no-verify] [-e] [--author=&lt;author&gt;]
            [--date=&lt;date&gt;] [--cleanup=&lt;mode&gt;] [--status | --no-status]
-           [-i | -o] [--] [&lt;file&gt;&#8230;]</div>
+           [-i | -o] [-S[&lt;keyid&gt;]] [--] [&lt;file&gt;&#8230;]</div>
 <div class="verseblock-attribution">
 </div></div>
 </div>
@@ -759,6 +759,15 @@ <h2 id="_options">OPTIONS</h2>
 </p>
 </dd>
 <dt class="hdlist1">
+--long
+</dt>
+<dd>
+<p>
+        When doing a dry-run, give the output in a the long-format.
+        Implies <tt>--dry-run</tt>.
+</p>
+</dd>
+<dt class="hdlist1">
 -z
 </dt>
 <dt class="hdlist1">
@@ -1069,6 +1078,17 @@ <h2 id="_options">OPTIONS</h2>
 </p>
 </dd>
 <dt class="hdlist1">
+-S[&lt;keyid&gt;]
+</dt>
+<dt class="hdlist1">
+--gpg-sign[=&lt;keyid&gt;]
+</dt>
+<dd>
+<p>
+        GPG-sign commit.
+</p>
+</dd>
+<dt class="hdlist1">
 --
 </dt>
 <dd>
@@ -1349,7 +1369,7 @@ <h2 id="_git">GIT</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2012-09-17 16:55:59 PDT
+Last updated 2012-11-13 14:31:09 PDT
 </div>
 </div>
 </body>

git-commit.txt

@@ -13,7 +13,7 @@ SYNOPSIS
 	   [-F <file> | -m <msg>] [--reset-author] [--allow-empty]
 	   [--allow-empty-message] [--no-verify] [-e] [--author=<author>]
 	   [--date=<date>] [--cleanup=<mode>] [--status | --no-status]
-	   [-i | -o] [--] [<file>...]
+	   [-i | -o] [-S[<keyid>]] [--] [<file>...]
 
 DESCRIPTION
 -----------
@@ -109,6 +109,10 @@ OPTIONS
 	format. See linkgit:git-status[1] for details. Implies
 	`--dry-run`.
 
+--long::
+	When doing a dry-run, give the output in a the long-format.
+	Implies `--dry-run`.
+
 -z::
 --null::
 	When showing `short` or `porcelain` status output, terminate
@@ -276,6 +280,10 @@ configuration variable documented in linkgit:git-config[1].
 	commit message template when using an editor to prepare the
 	default commit message.
 
+-S[<keyid>]::
+--gpg-sign[=<keyid>]::
+	GPG-sign commit.
+
 \--::
 	Do not interpret any more arguments as options.
 

git-config.html

@@ -1805,14 +1805,14 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
         <tt>LESS</tt> variable to some other value.  Alternately,
         these settings can be overridden on a project or
         global basis by setting the <tt>core.pager</tt> option.
-        Setting <tt>core.pager</tt> has no affect on the <tt>LESS</tt>
+        Setting <tt>core.pager</tt> has no effect on the <tt>LESS</tt>
         environment variable behaviour above, so if you want
         to override git&#8217;s default settings this way, you need
         to be explicit.  For example, to disable the S option
         in a backward compatible manner, set <tt>core.pager</tt>
-        to <tt>less -+$LESS -FRX</tt>.  This will be passed to the
-        shell by git, which will translate the final command to
-        <tt>LESS=FRSX less -+FRSX -FRX</tt>.
+        to <tt>less -+S</tt>.  This will be passed to the shell by
+        git, which will translate the final command to
+        <tt>LESS=FRSX less -+S</tt>.
 </p>
 </dd>
 <dt class="hdlist1">
@@ -2652,6 +2652,21 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
 </p>
 </dd>
 <dt class="hdlist1">
+diff.context
+</dt>
+<dd>
+<p>
+        Generate diffs with &lt;n&gt; lines of context instead of the default of
+</p>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+This value is overridden by the -U option.
+</p>
+</li>
+</ol></div>
+</dd>
+<dt class="hdlist1">
 diff.external
 </dt>
 <dd>
@@ -3968,11 +3983,11 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
 <p>
         If merge is called without any commit argument, merge the upstream
         branches configured for the current branch by using their last
-        observed values stored in their remote tracking branches.
+        observed values stored in their remote-tracking branches.
         The values of the <tt>branch.&lt;current branch&gt;.merge</tt> that name the
         branches at the remote named by <tt>branch.&lt;current branch&gt;.remote</tt>
         are consulted, and then they are mapped via <tt>remote.&lt;remote&gt;.fetch</tt>
-        to their corresponding remote tracking branches, and the tips of
+        to their corresponding remote-tracking branches, and the tips of
         these tracking branches are merged.
 </p>
 </dd>

git-log.html

@@ -800,6 +800,15 @@ <h3 id="_commit_limiting">Commit Limiting</h3><div style="clear:left"></div>
 </p>
 </dd>
 <dt class="hdlist1">
+--basic-regexp
+</dt>
+<dd>
+<p>
+        Consider the limiting patterns to be basic regular expressions;
+        this is the default.
+</p>
+</dd>
+<dt class="hdlist1">
 -E
 </dt>
 <dt class="hdlist1">
@@ -824,6 +833,15 @@ <h3 id="_commit_limiting">Commit Limiting</h3><div style="clear:left"></div>
 </p>
 </dd>
 <dt class="hdlist1">
+--perl-regexp
+</dt>
+<dd>
+<p>
+        Consider the limiting patterns to be Perl-compatible regexp.
+        Requires libpcre to be compiled in.
+</p>
+</dd>
+<dt class="hdlist1">
 --remove-empty
 </dt>
 <dd>

git-merge.html

@@ -878,7 +878,7 @@ <h2 id="_options">OPTIONS</h2>
         more than two parents (affectionately called an Octopus merge).
 </p>
 <div class="paragraph"><p>If no commit is given from the command line, and if <tt>merge.defaultToUpstream</tt>
-configuration variable is set, merge the remote tracking branches
+configuration variable is set, merge the remote-tracking branches
 that the current branch is configured to use as its upstream.
 See also the configuration section of this manual page.</p></div>
 </dd>
@@ -1325,11 +1325,11 @@ <h2 id="_configuration">CONFIGURATION</h2>
 <p>
         If merge is called without any commit argument, merge the upstream
         branches configured for the current branch by using their last
-        observed values stored in their remote tracking branches.
+        observed values stored in their remote-tracking branches.
         The values of the <tt>branch.&lt;current branch&gt;.merge</tt> that name the
         branches at the remote named by <tt>branch.&lt;current branch&gt;.remote</tt>
         are consulted, and then they are mapped via <tt>remote.&lt;remote&gt;.fetch</tt>
-        to their corresponding remote tracking branches, and the tips of
+        to their corresponding remote-tracking branches, and the tips of
         these tracking branches are merged.
 </p>
 </dd>
@@ -1476,7 +1476,7 @@ <h2 id="_git">GIT</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2012-07-23 21:34:17 PDT
+Last updated 2012-11-13 14:31:09 PDT
 </div>
 </div>
 </body>

git-merge.txt

@@ -99,7 +99,7 @@ commit or stash your changes before running 'git merge'.
 	more than two parents (affectionately called an Octopus merge).
 +
 If no commit is given from the command line, and if `merge.defaultToUpstream`
-configuration variable is set, merge the remote tracking branches
+configuration variable is set, merge the remote-tracking branches
 that the current branch is configured to use as its upstream.
 See also the configuration section of this manual page.
 

git-push.html

@@ -845,7 +845,7 @@ <h2 id="_options_a_id_options_a">OPTIONS<a id="OPTIONS"></a></h2>
 <dd>
 <p>
         Make sure all submodule commits used by the revisions to be
-        pushed are available on a remote tracking branch. If <em>check</em> is
+        pushed are available on a remote-tracking branch. If <em>check</em> is
         used git will verify that all submodule commits that changed in
         the revisions to be pushed are available on at least one remote
         of the submodule. If any commits are missing the push will be
@@ -1430,7 +1430,7 @@ <h2 id="_git">GIT</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2012-10-02 15:49:44 PDT
+Last updated 2012-11-13 14:31:09 PDT
 </div>
 </div>
 </body>

git-push.txt

@@ -175,7 +175,7 @@ useful if you write an alias or script around 'git push'.
 
 --recurse-submodules=check|on-demand::
 	Make sure all submodule commits used by the revisions to be
-	pushed are available on a remote tracking branch. If 'check' is
+	pushed are available on a remote-tracking branch. If 'check' is
 	used git will verify that all submodule commits that changed in
 	the revisions to be pushed are available on at least one remote
 	of the submodule. If any commits are missing the push will be

git-remote-helpers.html

@@ -695,6 +695,25 @@ <h3 id="_capabilities">Capabilities</h3><div style="clear:left"></div>
 the list command.  If no <em>refspec</em> capability is advertised,
 there is an implied <tt>refspec *:*</tt>.</p></div>
 </dd>
+<dt class="hdlist1">
+<em>bidi-import</em>
+</dt>
+<dd>
+<p>
+        The fast-import commands <em>cat-blob</em> and <em>ls</em> can be used by remote-helpers
+        to retrieve information about blobs and trees that already exist in
+        fast-import&#8217;s memory. This requires a channel from fast-import to the
+        remote-helper.
+        If it is advertised in addition to "import", git establishes a pipe from
+        fast-import to the remote-helper&#8217;s stdin.
+        It follows that git and fast-import are both connected to the
+        remote-helper&#8217;s stdin. Because git can send multiple commands to
+        the remote-helper it is required that helpers that use <em>bidi-import</em>
+        buffer all <em>import</em> commands of a batch before sending data to fast-import.
+        This is to prevent mixing commands and fast-import responses on the
+        helper&#8217;s stdin.
+</p>
+</dd>
 </dl></div>
 <h3 id="_capabilities_for_pushing">Capabilities for Pushing</h3><div style="clear:left"></div>
 <div class="dlist"><dl>
@@ -925,7 +944,11 @@ <h2 id="_commands">COMMANDS</h2>
 terminated with a blank line. For each batch of <em>import</em>, the remote
 helper should produce a fast-import stream terminated by a <em>done</em>
 command.</p></div>
-<div class="paragraph"><p>Supported if the helper has the "import" capability.</p></div>
+<div class="paragraph"><p>Note that if the <em>bidi-import</em> capability is used the complete batch
+sequence has to be buffered before starting to send data to fast-import
+to prevent mixing of commands and fast-import responses on the helper&#8217;s
+stdin.</p></div>
+<div class="paragraph"><p>Supported if the helper has the <em>import</em> capability.</p></div>
 </dd>
 <dt class="hdlist1">
 <em>connect</em> &lt;service&gt;
@@ -1055,7 +1078,7 @@ <h2 id="_git">GIT</h2>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2012-05-02 15:00:44 PDT
+Last updated 2012-11-13 14:31:09 PDT
 </div>
 </div>
 </body>

git-remote-helpers.txt

@@ -98,6 +98,20 @@ advertised with this capability must cover all refs reported by
 the list command.  If no 'refspec' capability is advertised,
 there is an implied `refspec *:*`.
 
+'bidi-import'::
+	The fast-import commands 'cat-blob' and 'ls' can be used by remote-helpers
+	to retrieve information about blobs and trees that already exist in
+	fast-import's memory. This requires a channel from fast-import to the
+	remote-helper.
+	If it is advertised in addition to "import", git establishes a pipe from
+	fast-import to the remote-helper's stdin.
+	It follows that git and fast-import are both connected to the
+	remote-helper's stdin. Because git can send multiple commands to
+	the remote-helper it is required that helpers that use 'bidi-import'
+	buffer all 'import' commands of a batch before sending data to fast-import.
+	This is to prevent mixing commands and fast-import responses on the
+	helper's stdin.
+
 Capabilities for Pushing
 ~~~~~~~~~~~~~~~~~~~~~~~~
 'connect'::
@@ -286,7 +300,12 @@ terminated with a blank line. For each batch of 'import', the remote
 helper should produce a fast-import stream terminated by a 'done'
 command.
 +
-Supported if the helper has the "import" capability.
+Note that if the 'bidi-import' capability is used the complete batch
+sequence has to be buffered before starting to send data to fast-import
+to prevent mixing of commands and fast-import responses on the helper's
+stdin.
++
+Supported if the helper has the 'import' capability.
 
 'connect' <service>::
 	Connects to given service. Standard input and standard output