Autogenerated HTML docs for v1.5.3.7-994-g36863

diff --git a/config.txt b/config.txt
index 39d1ef5298bd81868079b8d82ba56157e4785b5d..4124ad2970cfd76eb6592658c02007188c48003a 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -346,6 +346,13 @@ branch.<name>.mergeoptions::
        option values containing whitespace characters are currently not
        supported.
 
+branch.<name>.rebase::
+       When true, rebase the branch <name> on top of the fetched branch,
+       instead of merging the default branch from the default remote.
+       *NOTE*: this is a possibly dangerous operation; do *not* use
+       it unless you understand the implications (see gitlink:git-rebase[1]
+       for details).
+
 clean.requireForce::
        A boolean to make git-clean do nothing unless given -f
        or -n.   Defaults to true.

diff --git a/git-commit.html b/git-commit.html
index 0283f709fb260c620a3dc34a5d8519c99a5f632d..90b59cbc468d6a1395ccd27be51ea700aeb87a4d 100644 (file)
--- a/git-commit.html
+++ b/git-commit.html
@@ -275,7 +275,7 @@ git-commit(1) Manual Page
 <div class="verseblock">\r
 <div class="content"><em>git-commit</em> [-a | --interactive] [-s] [-v] [-u]\r
            [(-c | -C) &lt;commit&gt; | -F &lt;file&gt; | -m &lt;msg&gt; | --amend]\r
-           [--no-verify] [-e] [--author &lt;author&gt;]\r
+           [--allow-empty] [--no-verify] [-e] [--author &lt;author&gt;]\r
            [--] [[-i | -o ]&lt;file&gt;&#8230;]</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
@@ -409,6 +409,17 @@ that, you can recover from it with <a href="git-reset.html">git-reset(1)</a>.</p
 </p>\r
 </dd>\r
 <dt>\r
+--allow-empty\r
+</dt>\r
+<dd>\r
+<p>\r
+        Usually recording a commit that has the exact same tree as its\r
+        sole parent commit and the command prevents you from making such\r
+        a mistake.  This option bypasses the safety, and is primarily\r
+        for use by foreign scm interface scripts.\r
+</p>\r
+</dd>\r
+<dt>\r
 -e|--edit\r
 </dt>\r
 <dd>\r
@@ -704,7 +715,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:25 UTC\r
+Last updated 03-Dec-2007 09:57:28 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-commit.txt b/git-commit.txt
index d4bfd49ce12ebe8f7b172d6f682d64ccbce66087..a7ef71ff99ced2f973d8e4c857d49e75ec65a908 100644 (file)
--- a/git-commit.txt
+++ b/git-commit.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 [verse]
 'git-commit' [-a | --interactive] [-s] [-v] [-u]
           [(-c | -C) <commit> | -F <file> | -m <msg> | --amend]
-          [--no-verify] [-e] [--author <author>]
+          [--allow-empty] [--no-verify] [-e] [--author <author>]
           [--] [[-i | -o ]<file>...]
 
 DESCRIPTION
@@ -89,6 +89,12 @@ OPTIONS
        This option bypasses the pre-commit hook.
        See also link:hooks.html[hooks].
 
+--allow-empty::
+       Usually recording a commit that has the exact same tree as its
+       sole parent commit and the command prevents you from making such
+       a mistake.  This option bypasses the safety, and is primarily
+       for use by foreign scm interface scripts.
+
 -e|--edit::
        The message taken from file with `-F`, command line with
        `-m`, and from file with `-C` are usually used as the

diff --git a/git-config.html b/git-config.html
index 853dcb926599ef6a51423dcbcb4127827e91732a..14615e1161f58fa5b4e4253ba23f8e4bec5e75ec 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -283,7 +283,8 @@ git-config(1) Manual Page
 <em>git-config</em> [&lt;file-option&gt;] --unset-all name [value_regex]\r
 <em>git-config</em> [&lt;file-option&gt;] --rename-section old_name new_name\r
 <em>git-config</em> [&lt;file-option&gt;] --remove-section name\r
-<em>git-config</em> [&lt;file-option&gt;] [-z|--null] -l | --list</div></div>\r
+<em>git-config</em> [&lt;file-option&gt;] [-z|--null] -l | --list\r
+<em>git-config</em> [&lt;file-option&gt;] --get-color name [default]</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -498,6 +499,17 @@ rather than from all available files.</p>
         contain line breaks.\r
 </p>\r
 </dd>\r
+<dt>\r
+--get-color name default\r
+</dt>\r
+<dd>\r
+<p>\r
+        Find the color configured for <tt>name</tt> (e.g. <tt>color.diff.new</tt>) and\r
+        output it as the ANSI color escape sequence to the standard\r
+        output.  The optional <tt>default</tt> parameter is used instead, if\r
+        there is no color configured for <tt>name</tt>.\r
+</p>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2><a id="FILES"></a>FILES</h2>\r
@@ -669,6 +681,15 @@ i.e. the one without a "for &#8230;" postfix, do something like this:</p>
 <div class="content">\r
 <pre><tt>% git config core.gitproxy '"proxy-command" for example.com'</tt></pre>\r
 </div></div>\r
+<p>An example to use customized color from the configuration in your\r
+script:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>#!/bin/sh\r
+WS=$(git config --get-color color.diff.whitespace "blue reverse")\r
+RESET=$(git config --get-color "" "reset")\r
+echo "${WS}your whitespace color or blue reverse${RESET}"</tt></pre>\r
+</div></div>\r
 </div>\r
 <h2>CONFIGURATION FILE</h2>\r
 <div class="sectionbody">\r
@@ -1130,6 +1151,18 @@ branch.&lt;name&gt;.mergeoptions
 </p>\r
 </dd>\r
 <dt>\r
+branch.&lt;name&gt;.rebase\r
+</dt>\r
+<dd>\r
+<p>\r
+        When true, rebase the branch &lt;name&gt; on top of the fetched branch,\r
+        instead of merging the default branch from the default remote.\r
+        <strong>NOTE</strong>: this is a possibly dangerous operation; do <strong>not</strong> use\r
+        it unless you understand the implications (see <a href="git-rebase.html">git-rebase(1)</a>\r
+        for details).\r
+</p>\r
+</dd>\r
+<dt>\r
 clean.requireForce\r
 </dt>\r
 <dd>\r
@@ -1971,7 +2004,7 @@ transfer.unpackLimit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 21-Nov-2007 08:54:16 UTC\r
+Last updated 03-Dec-2007 09:57:28 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-config.txt b/git-config.txt
index a592b61e2fe998525d0978547b3ea7e4ad2d72ac..7640450787064aac7211b5a3d5504275b62119ff 100644 (file)
--- a/git-config.txt
+++ b/git-config.txt
@@ -20,6 +20,7 @@ SYNOPSIS
 'git-config' [<file-option>] --rename-section old_name new_name
 'git-config' [<file-option>] --remove-section name
 'git-config' [<file-option>] [-z|--null] -l | --list
+'git-config' [<file-option>] --get-color name [default]
 
 DESCRIPTION
 -----------
@@ -134,6 +135,12 @@ See also <<FILES>>.
        output without getting confused e.g. by values that
        contain line breaks.
 
+--get-color name default::
+
+       Find the color configured for `name` (e.g. `color.diff.new`) and
+       output it as the ANSI color escape sequence to the standard
+       output.  The optional `default` parameter is used instead, if
+       there is no color configured for `name`.
 
 [[FILES]]
 FILES
@@ -292,6 +299,15 @@ To add a new proxy, without altering any of the existing ones, use
 % git config core.gitproxy '"proxy-command" for example.com'
 ------------
 
+An example to use customized color from the configuration in your
+script:
+
+------------
+#!/bin/sh
+WS=$(git config --get-color color.diff.whitespace "blue reverse")
+RESET=$(git config --get-color "" "reset")
+echo "${WS}your whitespace color or blue reverse${RESET}"
+------------
 
 include::config.txt[]
 

diff --git a/git-fast-export.html b/git-fast-export.html
new file mode 100644 (file)
index 0000000..b881634
--- /dev/null
+++ b/git-fast-export.html
@@ -0,0 +1,358 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"\r
+    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\r
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
+<head>\r
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
+<style type="text/css">\r
+/* Debug borders */\r
+p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
+/*\r
+  border: 1px solid red;\r
+*/\r
+}\r
+\r
+body {\r
+  margin: 1em 5% 1em 5%;\r
+}\r
+\r
+a { color: blue; }\r
+a:visited { color: fuchsia; }\r
+\r
+em {\r
+  font-style: italic;\r
+}\r
+\r
+strong {\r
+  font-weight: bold;\r
+}\r
+\r
+tt {\r
+  color: navy;\r
+}\r
+\r
+h1, h2, h3, h4, h5, h6 {\r
+  color: #527bbd;\r
+  font-family: sans-serif;\r
+  margin-top: 1.2em;\r
+  margin-bottom: 0.5em;\r
+  line-height: 1.3;\r
+}\r
+\r
+h1 {\r
+  border-bottom: 2px solid silver;\r
+}\r
+h2 {\r
+  border-bottom: 2px solid silver;\r
+  padding-top: 0.5em;\r
+}\r
+\r
+div.sectionbody {\r
+  font-family: serif;\r
+  margin-left: 0;\r
+}\r
+\r
+hr {\r
+  border: 1px solid silver;\r
+}\r
+\r
+p {\r
+  margin-top: 0.5em;\r
+  margin-bottom: 0.5em;\r
+}\r
+\r
+pre {\r
+  padding: 0;\r
+  margin: 0;\r
+}\r
+\r
+span#author {\r
+  color: #527bbd;\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+  font-size: 1.2em;\r
+}\r
+span#email {\r
+}\r
+span#revision {\r
+  font-family: sans-serif;\r
+}\r
+\r
+div#footer {\r
+  font-family: sans-serif;\r
+  font-size: small;\r
+  border-top: 2px solid silver;\r
+  padding-top: 0.5em;\r
+  margin-top: 4.0em;\r
+}\r
+div#footer-text {\r
+  float: left;\r
+  padding-bottom: 0.5em;\r
+}\r
+div#footer-badges {\r
+  float: right;\r
+  padding-bottom: 0.5em;\r
+}\r
+\r
+div#preamble,\r
+div.tableblock, div.imageblock, div.exampleblock, div.verseblock,\r
+div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,\r
+div.admonitionblock {\r
+  margin-right: 10%;\r
+  margin-top: 1.5em;\r
+  margin-bottom: 1.5em;\r
+}\r
+div.admonitionblock {\r
+  margin-top: 2.5em;\r
+  margin-bottom: 2.5em;\r
+}\r
+\r
+div.content { /* Block element content. */\r
+  padding: 0;\r
+}\r
+\r
+/* Block element titles. */\r
+div.title, caption.title {\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+  text-align: left;\r
+  margin-top: 1.0em;\r
+  margin-bottom: 0.5em;\r
+}\r
+div.title + * {\r
+  margin-top: 0;\r
+}\r
+\r
+td div.title:first-child {\r
+  margin-top: 0.0em;\r
+}\r
+div.content div.title:first-child {\r
+  margin-top: 0.0em;\r
+}\r
+div.content + div.title {\r
+  margin-top: 0.0em;\r
+}\r
+\r
+div.sidebarblock > div.content {\r
+  background: #ffffee;\r
+  border: 1px solid silver;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.listingblock > div.content {\r
+  border: 1px solid silver;\r
+  background: #f4f4f4;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.quoteblock > div.content {\r
+  padding-left: 2.0em;\r
+}\r
+div.quoteblock .attribution {\r
+  text-align: right;\r
+}\r
+\r
+div.admonitionblock .icon {\r
+  vertical-align: top;\r
+  font-size: 1.1em;\r
+  font-weight: bold;\r
+  text-decoration: underline;\r
+  color: #527bbd;\r
+  padding-right: 0.5em;\r
+}\r
+div.admonitionblock td.content {\r
+  padding-left: 0.5em;\r
+  border-left: 2px solid silver;\r
+}\r
+\r
+div.exampleblock > div.content {\r
+  border-left: 2px solid silver;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.verseblock div.content {\r
+  white-space: pre;\r
+}\r
+\r
+div.imageblock div.content { padding-left: 0; }\r
+div.imageblock img { border: 1px solid silver; }\r
+span.image img { border-style: none; }\r
+\r
+dl {\r
+  margin-top: 0.8em;\r
+  margin-bottom: 0.8em;\r
+}\r
+dt {\r
+  margin-top: 0.5em;\r
+  margin-bottom: 0;\r
+  font-style: italic;\r
+}\r
+dd > *:first-child {\r
+  margin-top: 0;\r
+}\r
+\r
+ul, ol {\r
+    list-style-position: outside;\r
+}\r
+ol.olist2 {\r
+  list-style-type: lower-alpha;\r
+}\r
+\r
+div.tableblock > table {\r
+  border-color: #527bbd;\r
+  border-width: 3px;\r
+}\r
+thead {\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+}\r
+tfoot {\r
+  font-weight: bold;\r
+}\r
+\r
+div.hlist {\r
+  margin-top: 0.8em;\r
+  margin-bottom: 0.8em;\r
+}\r
+td.hlist1 {\r
+  vertical-align: top;\r
+  font-style: italic;\r
+  padding-right: 0.8em;\r
+}\r
+td.hlist2 {\r
+  vertical-align: top;\r
+}\r
+\r
+@media print {\r
+  div#footer-badges { display: none; }\r
+}\r
+include::./stylesheets/xhtml11-manpage.css[]\r
+/* Workarounds for IE6's broken and incomplete CSS2. */\r
+\r
+div.sidebar-content {\r
+  background: #ffffee;\r
+  border: 1px solid silver;\r
+  padding: 0.5em;\r
+}\r
+div.sidebar-title, div.image-title {\r
+  font-family: sans-serif;\r
+  font-weight: bold;\r
+  margin-top: 0.0em;\r
+  margin-bottom: 0.5em;\r
+}\r
+\r
+div.listingblock div.content {\r
+  border: 1px solid silver;\r
+  background: #f4f4f4;\r
+  padding: 0.5em;\r
+}\r
+\r
+div.quoteblock-content {\r
+  padding-left: 2.0em;\r
+}\r
+\r
+div.exampleblock-content {\r
+  border-left: 2px solid silver;\r
+  padding-left: 0.5em;\r
+}\r
+</style>\r
+<title>git-fast-export(1)</title>\r
+</head>\r
+<body>\r
+<div id="header">\r
+<h1>\r
+git-fast-export(1) Manual Page\r
+</h1>\r
+<h2>NAME</h2>\r
+<div class="sectionbody">\r
+<p>git-fast-export -\r
+   Git data exporter\r
+</p>\r
+</div>\r
+</div>\r
+<h2>SYNOPSIS</h2>\r
+<div class="sectionbody">\r
+<p><em>git-fast-export [options]</em> | <em>git-fast-import</em></p>\r
+</div>\r
+<h2>DESCRIPTION</h2>\r
+<div class="sectionbody">\r
+<p>This program dumps the given revisions in a form suitable to be piped\r
+into <a href="git-fast-import.html">git-fast-import(1)</a>.</p>\r
+<p>You can use it as a human readable bundle replacement (see\r
+<a href="git-bundle.html">git-bundle(1)</a>), or as a kind of an interactive\r
+<a href="git-filter-branch.html">git-filter-branch(1)</a>.</p>\r
+</div>\r
+<h2>OPTIONS</h2>\r
+<div class="sectionbody">\r
+<dl>\r
+<dt>\r
+--progress=&lt;n&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        Insert <em>progress</em> statements every &lt;n&gt; objects, to be shown by\r
+        <a href="git-fast-import.html">git-fast-import(1)</a> during import.\r
+</p>\r
+</dd>\r
+<dt>\r
+--signed-tags=(ignore|warn|strip|abort)\r
+</dt>\r
+<dd>\r
+<p>\r
+        Specify how to handle signed tags.  Since any transformation\r
+        after the export can change the tag names (which can also happen\r
+        when excluding revisions) the signatures will not match.\r
+</p>\r
+<p>When asking to <em>abort</em> (which is the default), this program will die\r
+when encountering a signed tag.  With <em>strip</em>, the tags will be made\r
+unsigned, with <em>ignore</em>, they will be silently ignored (i.e. not exported)\r
+and with <em>warn</em>, they will be exported, but you will see a warning.</p>\r
+</dd>\r
+</dl>\r
+</div>\r
+<h2>EXAMPLES</h2>\r
+<div class="sectionbody">\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ git fast-export --all | (cd /empty/repository &amp;&amp; git fast-import)</tt></pre>\r
+</div></div>\r
+<p>This will export the whole repository and import it into the existing\r
+empty repository.  Except for reencoding commits that are not in\r
+UTF-8, it would be a one-to-one mirror.</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>$ git fast-export master~5..master |\r
+        sed "s|refs/heads/master|refs/heads/other|" |\r
+        git fast-import</tt></pre>\r
+</div></div>\r
+<p>This makes a new branch called <em>other</em> from <em>master~5..master</em>\r
+(i.e. if <em>master</em> has linear history, it will take the last 5 commits).</p>\r
+<p>Note that this assumes that none of the blobs and commit messages\r
+referenced by that revision range contains the string\r
+<em>refs/heads/master</em>.</p>\r
+</div>\r
+<h2>Limitations</h2>\r
+<div class="sectionbody">\r
+<p>Since <a href="git-fast-import.html">git-fast-import(1)</a> cannot tag trees, you will not be\r
+able to export the linux-2.6.git repository completely, as it contains\r
+a tag referencing a tree instead of a commit.</p>\r
+</div>\r
+<h2>Author</h2>\r
+<div class="sectionbody">\r
+<p>Written by Johannes E. Schindelin &lt;johannes.schindelin@gmx.de&gt;.</p>\r
+</div>\r
+<h2>Documentation</h2>\r
+<div class="sectionbody">\r
+<p>Documentation by Johannes E. Schindelin &lt;johannes.schindelin@gmx.de&gt;.</p>\r
+</div>\r
+<h2>GIT</h2>\r
+<div class="sectionbody">\r
+<p>Part of the <a href="git.html">git(7)</a> suite</p>\r
+</div>\r
+<div id="footer">\r
+<div id="footer-text">\r
+Last updated 03-Dec-2007 09:57:29 UTC\r
+</div>\r
+</div>\r
+</body>\r
+</html>\r

diff --git a/git-fast-export.txt b/git-fast-export.txt
new file mode 100644 (file)
index 0000000..073ff7f
--- /dev/null
+++ b/git-fast-export.txt
@@ -0,0 +1,83 @@
+git-fast-export(1)
+==================
+
+NAME
+----
+git-fast-export - Git data exporter
+
+
+SYNOPSIS
+--------
+'git-fast-export [options]' | 'git-fast-import'
+
+DESCRIPTION
+-----------
+This program dumps the given revisions in a form suitable to be piped
+into gitlink:git-fast-import[1].
+
+You can use it as a human readable bundle replacement (see
+gitlink:git-bundle[1]), or as a kind of an interactive
+gitlink:git-filter-branch[1].
+
+
+OPTIONS
+-------
+--progress=<n>::
+       Insert 'progress' statements every <n> objects, to be shown by
+       gitlink:git-fast-import[1] during import.
+
+--signed-tags=(ignore|warn|strip|abort)::
+       Specify how to handle signed tags.  Since any transformation
+       after the export can change the tag names (which can also happen
+       when excluding revisions) the signatures will not match.
++
+When asking to 'abort' (which is the default), this program will die
+when encountering a signed tag.  With 'strip', the tags will be made
+unsigned, with 'ignore', they will be silently ignored (i.e. not exported)
+and with 'warn', they will be exported, but you will see a warning.
+
+
+EXAMPLES
+--------
+
+-------------------------------------------------------------------
+$ git fast-export --all | (cd /empty/repository && git fast-import)
+-------------------------------------------------------------------
+
+This will export the whole repository and import it into the existing
+empty repository.  Except for reencoding commits that are not in
+UTF-8, it would be a one-to-one mirror.
+
+-----------------------------------------------------
+$ git fast-export master~5..master |
+       sed "s|refs/heads/master|refs/heads/other|" |
+       git fast-import
+-----------------------------------------------------
+
+This makes a new branch called 'other' from 'master~5..master'
+(i.e. if 'master' has linear history, it will take the last 5 commits).
+
+Note that this assumes that none of the blobs and commit messages
+referenced by that revision range contains the string
+'refs/heads/master'.
+
+
+Limitations
+-----------
+
+Since gitlink:git-fast-import[1] cannot tag trees, you will not be
+able to export the linux-2.6.git repository completely, as it contains
+a tag referencing a tree instead of a commit.
+
+
+Author
+------
+Written by Johannes E. Schindelin <johannes.schindelin@gmx.de>.
+
+Documentation
+--------------
+Documentation by Johannes E. Schindelin <johannes.schindelin@gmx.de>.
+
+GIT
+---
+Part of the gitlink:git[7] suite

diff --git a/git-prune.html b/git-prune.html
index 23c6013a2bddae420944aebfc2c64ef4d7bce96a..e4f66ba61563850552a36ba073734214d0ec7531 100644 (file)
--- a/git-prune.html
+++ b/git-prune.html
@@ -272,7 +272,7 @@ git-prune(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-prune</em> [-n] [--] [&lt;head&gt;&#8230;]</p>\r
+<p><em>git-prune</em> [-n] [--expire &lt;expire&gt;] [--] [&lt;head&gt;&#8230;]</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -305,6 +305,14 @@ running <tt>git prune-packed</tt>.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--expire &lt;time&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        Only expire loose objects older than &lt;time&gt;.\r
+</p>\r
+</dd>\r
+<dt>\r
 &lt;head&gt;&#8230;\r
 </dt>\r
 <dd>\r
@@ -340,7 +348,7 @@ borrows from your repository via its
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 14-Nov-2007 12:11:41 UTC\r
+Last updated 03-Dec-2007 09:57:29 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-prune.txt b/git-prune.txt
index 0ace233d18383f53ca4d31baaa8e3c230ddb874b..9835bdb878eab5e5af6baaad30150ee53e777436 100644 (file)
--- a/git-prune.txt
+++ b/git-prune.txt
@@ -8,7 +8,7 @@ git-prune - Prune all unreachable objects from the object database
 
 SYNOPSIS
 --------
-'git-prune' [-n] [--] [<head>...]
+'git-prune' [-n] [--expire <expire>] [--] [<head>...]
 
 DESCRIPTION
 -----------
@@ -31,6 +31,9 @@ OPTIONS
 \--::
        Do not interpret any more arguments as options.
 
+\--expire <time>::
+       Only expire loose objects older than <time>.
+
 <head>...::
        In addition to objects
        reachable from any of our references, keep objects

diff --git a/git-pull.html b/git-pull.html
index 912c8747a0cb8d8f33c7d9c53d6436e6fdfd5bdb..685e7d7f848c169c37452e37d29007f5bb970637 100644 (file)
--- a/git-pull.html
+++ b/git-pull.html
@@ -784,6 +784,26 @@ ours
         branches.\r
 </p>\r
 </dd>\r
+<dt>\r
+--rebase\r
+</dt>\r
+<dd>\r
+<p>\r
+        Instead of a merge, perform a rebase after fetching.\r
+        <strong>NOTE:</strong> This is a potentially _dangerous_ mode of operation.\r
+        It rewrites history, which does not bode well when you\r
+        published that history already.  Do <strong>not</strong> use this option\r
+        unless you have read <a href="git-rebase.html">git-rebase(1)</a> carefully.\r
+</p>\r
+</dd>\r
+<dt>\r
+--no-rebase\r
+</dt>\r
+<dd>\r
+<p>\r
+        Override earlier --rebase.\r
+</p>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2>DEFAULT BEHAVIOUR</h2>\r
@@ -946,7 +966,7 @@ Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 17-Nov-2007 20:50:31 UTC\r
+Last updated 03-Dec-2007 09:57:29 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-pull.txt b/git-pull.txt
index e1eb2c1d0037f06dbf2b5cc0bde84918157ee2bf..d4d26afea0fef29cd3e0ca2e7bb89f71d08d4c22 100644 (file)
--- a/git-pull.txt
+++ b/git-pull.txt
@@ -33,6 +33,16 @@ include::urls-remotes.txt[]
 
 include::merge-strategies.txt[]
 
+\--rebase::
+       Instead of a merge, perform a rebase after fetching.
+       *NOTE:* This is a potentially _dangerous_ mode of operation.
+       It rewrites history, which does not bode well when you
+       published that history already.  Do *not* use this option
+       unless you have read gitlink:git-rebase[1] carefully.
+
+\--no-rebase::
+       Override earlier \--rebase.
+
 DEFAULT BEHAVIOUR
 -----------------