Permalink
Browse files

Autogenerated HTML docs for v1.9.0-138-g2de34

  • Loading branch information...
1 parent 616a76d commit 5b3533dc1d20a4946b19e379650c2faa5b88c9ec @gitster committed Feb 27, 2014
@@ -26,7 +26,7 @@ linkgit:git-relink[1]::
Hardlink common objects in local repositories.
linkgit:git-remote[1]::
- manage set of tracked repositories.
+ Manage set of tracked repositories.
linkgit:git-repack[1]::
Pack unpacked objects in a repository.
View
@@ -992,6 +992,14 @@ commit.cleanup::
have to remove the help lines that begin with `#` in the commit log
template yourself, if you do this).
+commit.gpgsign::
+
+ A boolean to specify whether all commits should be GPG signed.
+ Use of this option when doing operations such as rebase can
+ result in a large number of commits being signed. It may be
+ convenient to use an agent to avoid typing your GPG passphrase
+ several times.
+
commit.status::
A boolean to enable/disable inclusion of status information in the
commit message template when using an editor to prepare the commit
@@ -1862,6 +1870,31 @@ pack.packSizeLimit::
Common unit suffixes of 'k', 'm', or 'g' are
supported.
+pack.useBitmaps::
+ When true, git will use pack bitmaps (if available) when packing
+ to stdout (e.g., during the server side of a fetch). Defaults to
+ true. You should not generally need to turn this off unless
+ you are debugging pack bitmaps.
+
+pack.writebitmaps::
+ When true, git will write a bitmap index when packing all
+ objects to disk (e.g., when `git repack -a` is run). This
+ index can speed up the "counting objects" phase of subsequent
+ packs created for clones and fetches, at the cost of some disk
+ space and extra time spent on the initial repack. Defaults to
+ false.
+
+pack.writeBitmapHashCache::
+ When true, git will include a "hash cache" section in the bitmap
+ index (if one is written). This cache can be used to feed git's
+ delta heuristics, potentially leading to better deltas between
+ bitmapped and non-bitmapped objects (e.g., when serving a fetch
+ between an older, bitmapped pack and objects that have been
+ pushed since the last gc). The downside is that it consumes 4
+ bytes per object of disk space, and that JGit's bitmap
+ implementation does not understand it, causing it to complain if
+ Git and JGit are used on the same repository. Defaults to false.
+
pager.<cmd>::
If the value is boolean, turns on or off pagination of the
output of a particular Git subcommand when writing to a tty.
@@ -1881,6 +1914,16 @@ pretty.<name>::
Note that an alias with the same name as a built-in format
will be silently ignored.
+pull.ff::
+ By default, Git does not create an extra merge commit when merging
+ a commit that is a descendant of the current commit. Instead, the
+ tip of the current branch is fast-forwarded. When set to `false`,
+ this variable tells Git to create an extra merge commit in such
+ a case (equivalent to giving the `--no-ff` option from the command
+ line). When set to `only`, only such fast-forward merges are
+ allowed (equivalent to giving the `--ff-only` option from the
+ command line).
+
pull.rebase::
When true, rebase branches on top of the fetched branch, instead
of merging the default branch from the default remote when "git
View
@@ -755,7 +755,7 @@ <h2 id="_synopsis">SYNOPSIS</h2>
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
[--whitespace=&lt;option&gt;] [-C&lt;n&gt;] [-p&lt;n&gt;] [--directory=&lt;dir&gt;]
[--exclude=&lt;path&gt;] [--include=&lt;path&gt;] [--reject] [-q | --quiet]
- [--[no-]scissors]
+ [--[no-]scissors] [-S[&lt;keyid&gt;]]
[(&lt;mbox&gt; | &lt;Maildir&gt;)&#8230;]
<em>git am</em> (--continue | --skip | --abort)</pre>
<div class="attribution">
@@ -979,6 +979,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 commits.
+</p>
+</dd>
+<dt class="hdlist1">
--continue
</dt>
<dt class="hdlist1">
@@ -1101,7 +1112,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 2014-02-27 15:06:29 PST
</div>
</div>
</body>
View
@@ -14,7 +14,7 @@ SYNOPSIS
[--ignore-date] [--ignore-space-change | --ignore-whitespace]
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
[--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
- [--[no-]scissors]
+ [--[no-]scissors] [-S[<keyid>]]
[(<mbox> | <Maildir>)...]
'git am' (--continue | --skip | --abort)
@@ -119,6 +119,10 @@ default. You can use `--no-utf8` to override this.
Skip the current patch. This is only meaningful when
restarting an aborted patch.
+-S[<keyid>]::
+--gpg-sign[=<keyid>]::
+ GPG-sign commits.
+
--continue::
-r::
--resolved::
View
@@ -776,7 +776,8 @@ <h2 id="_description">DESCRIPTION</h2>
development history for when a code snippet occurred in a change. This makes it
possible to track when a code snippet was added to a file, moved or copied
between files, and eventually deleted or replaced. It works by searching for
-a text string in the diff. A small example:</p></div>
+a text string in the diff. A small example of the pickaxe interface
+that searches for <tt>blame_usage</tt>:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git log --pretty=oneline -S'blame_usage'
@@ -1385,7 +1386,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-11-12 15:22:25 PST
+Last updated 2014-02-27 15:06:29 PST
</div>
</div>
</body>
View
@@ -35,7 +35,8 @@ Apart from supporting file annotation, Git also supports searching the
development history for when a code snippet occurred in a change. This makes it
possible to track when a code snippet was added to a file, moved or copied
between files, and eventually deleted or replaced. It works by searching for
-a text string in the diff. A small example:
+a text string in the diff. A small example of the pickaxe interface
+that searches for `blame_usage`:
-----------------------------------------------------------------------------
$ git log --pretty=oneline -S'blame_usage'
View
@@ -750,7 +750,8 @@
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git cherry-pick</em> [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] &lt;commit&gt;&#8230;
+<pre class="content"><em>git cherry-pick</em> [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]
+ [-S[&lt;keyid&gt;]] &lt;commit&gt;&#8230;
<em>git cherry-pick</em> --continue
<em>git cherry-pick</em> --quit
<em>git cherry-pick</em> --abort</pre>
@@ -910,6 +911,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 commits.
+</p>
+</dd>
+<dt class="hdlist1">
--ff
</dt>
<dd>
@@ -1160,7 +1172,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 2014-02-27 15:06:29 PST
</div>
</div>
</body>
View
@@ -8,7 +8,8 @@ git-cherry-pick - Apply the changes introduced by some existing commits
SYNOPSIS
--------
[verse]
-'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit>...
+'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff]
+ [-S[<keyid>]] <commit>...
'git cherry-pick' --continue
'git cherry-pick' --quit
'git cherry-pick' --abort
@@ -100,6 +101,10 @@ effect to your index in a row.
--signoff::
Add Signed-off-by line at the end of the commit message.
+-S[<keyid>]::
+--gpg-sign[=<keyid>]::
+ GPG-sign commits.
+
--ff::
If the current HEAD is the same as the parent of the
cherry-pick'ed commit, then a fast forward to this commit will
View
@@ -805,18 +805,16 @@ <h2 id="_options">OPTIONS</h2>
never use the local optimizations). Specifying <tt>--no-local</tt> will
override the default when <tt>/path/to/repo</tt> is given, using the regular
Git transport instead.</p></div>
-<div class="paragraph"><p>To force copying instead of hardlinking (which may be desirable if you
-are trying to make a back-up of your repository), but still avoid the
-usual "Git aware" transport mechanism, <tt>--no-hardlinks</tt> can be used.</p></div>
</dd>
<dt class="hdlist1">
--no-hardlinks
</dt>
<dd>
<p>
- Optimize the cloning process from a repository on a
- local filesystem by copying files under <tt>.git/objects</tt>
- directory.
+ Force the cloning process from a repository on a local
+ filesystem to copy the files under the <tt>.git/objects</tt>
+ directory instead of using hardlinks. This may be desirable
+ if you are trying to make a back-up of your repository.
</p>
</dd>
<dt class="hdlist1">
@@ -1288,7 +1286,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2014-02-07 12:30:09 PST
+Last updated 2014-02-27 15:06:29 PST
</div>
</div>
</body>
View
@@ -55,15 +55,12 @@ repository is specified as a URL, then this flag is ignored (and we
never use the local optimizations). Specifying `--no-local` will
override the default when `/path/to/repo` is given, using the regular
Git transport instead.
-+
-To force copying instead of hardlinking (which may be desirable if you
-are trying to make a back-up of your repository), but still avoid the
-usual "Git aware" transport mechanism, `--no-hardlinks` can be used.
--no-hardlinks::
- Optimize the cloning process from a repository on a
- local filesystem by copying files under `.git/objects`
- directory.
+ Force the cloning process from a repository on a local
+ filesystem to copy the files under the `.git/objects`
+ directory instead of using hardlinks. This may be desirable
+ if you are trying to make a back-up of your repository.
--shared::
-s::
View
@@ -820,11 +820,23 @@ <h2 id="_options">OPTIONS</h2>
<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">
+--no-gpg-sign
+</dt>
+<dd>
+<p>
+ Countermand <tt>commit.gpgsign</tt> configuration variable that is
+ set to force each and every commit to be signed.
+</p>
+</dd>
</dl></div>
</div>
</div>
@@ -1020,7 +1032,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 2014-02-27 15:06:29 PST
</div>
</div>
</body>
View
@@ -55,8 +55,13 @@ OPTIONS
from the standard input.
-S[<keyid>]::
+--gpg-sign[=<keyid>]::
GPG-sign commit.
+--no-gpg-sign::
+ Countermand `commit.gpgsign` configuration variable that is
+ set to force each and every commit to be signed.
+
Commit Information
------------------
View
@@ -1308,6 +1308,15 @@ <h2 id="_options">OPTIONS</h2>
</p>
</dd>
<dt class="hdlist1">
+--no-gpg-sign
+</dt>
+<dd>
+<p>
+ Countermand <tt>commit.gpgsign</tt> configuration variable that is
+ set to force each and every commit to be signed.
+</p>
+</dd>
+<dt class="hdlist1">
--
</dt>
<dd>
@@ -1605,7 +1614,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 2014-02-27 15:06:29 PST
</div>
</div>
</body>
View
@@ -302,6 +302,10 @@ configuration variable documented in linkgit:git-config[1].
--gpg-sign[=<keyid>]::
GPG-sign commit.
+--no-gpg-sign::
+ Countermand `commit.gpgsign` configuration variable that is
+ set to force each and every commit to be signed.
+
\--::
Do not interpret any more arguments as options.
Oops, something went wrong.

0 comments on commit 5b3533d

Please sign in to comment.