Autogenerated HTML docs for v1.5.4.3-325-g6d21

diff --git a/config.txt b/config.txt
index fb6dae0cc2d399821c708c77904565e00ff2eb39..4027726f2ee66ebad69412a5c8c6d1aef7f7463f 100644 (file)
--- a/config.txt
+++ b/config.txt
@@ -379,10 +379,14 @@ apply.whitespace::
 
 branch.autosetupmerge::
        Tells `git-branch` and `git-checkout` to setup new branches
-       so that linkgit:git-pull[1] will appropriately merge from that
-       remote branch.  Note that even if this option is not set,
+       so that linkgit:git-pull[1] will appropriately merge from the
+       starting point branch. Note that even if this option is not set,
        this behavior can be chosen per-branch using the `--track`
-       and `--no-track` options.  This option defaults to true.
+       and `--no-track` options. The valid settings are: `false` -- no
+       automatic setup is done; `true` -- automatic setup is done when the
+       starting point is a remote branch; `always` -- automatic setup is
+       done when the starting point is either a local branch or remote
+       branch. This option defaults to true.
 
 branch.<name>.remote::
        When in branch <name>, it tells `git fetch` which remote to fetch.
@@ -812,6 +816,8 @@ pack.threads::
        warning. This is meant to reduce packing time on multiprocessor
        machines. The required amount of memory for the delta search window
        is however multiplied by the number of threads.
+       Specifying 0 will cause git to auto-detect the number of CPU's
+       and set the number of threads accordingly.
 
 pack.indexVersion::
        Specify the default pack index version.  Valid values are 1 for
@@ -897,6 +903,17 @@ tar.umask::
        archiving user's umask will be used instead.  See umask(2) and
        linkgit:git-archive[1].
 
+url.<base>.insteadOf::
+       Any URL that starts with this value will be rewritten to
+       start, instead, with <base>. In cases where some site serves a
+       large number of repositories, and serves them with multiple
+       access methods, and some users need to use different access
+       methods, this feature allows people to specify any of the
+       equivalent URLs and have git automatically rewrite the URL to
+       the best alternative for the particular user, even for a
+       never-before-seen repository on the site.  When more than one
+       insteadOf strings match a given URL, the longest match is used.
+
 user.email::
        Your email address to be recorded in any newly created commits.
        Can be overridden by the 'GIT_AUTHOR_EMAIL', 'GIT_COMMITTER_EMAIL', and

diff --git a/diff-options.txt b/diff-options.txt
index 8d35cbd60d9d6fb2a0aeef8a6b956e099743cb28..8dc5b001c42376be1b9f814d516ea43f5c711071 100644 (file)
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -170,6 +170,14 @@ endif::git-format-patch[]
        Swap two inputs; that is, show differences from index or
        on-disk file to tree contents.
 
+--relative[=<path>]::
+       When run from a subdirectory of the project, it can be
+       told to exclude changes outside the directory and show
+       pathnames relative to it with this option.  When you are
+       not in a subdirectory (e.g. in a bare repository), you
+       can name which subdirectory to make the output relative
+       to by giving a <path> as an argument.
+
 --text::
        Treat all files as text.
 

diff --git a/git-branch.html b/git-branch.html
index 227436d9cc4e3ee52f5c3ea0f6b5396f2c97b434..6e1bc8bd0ff3152e6a21bf49c1c8034fc0980626 100644 (file)
--- a/git-branch.html
+++ b/git-branch.html
@@ -297,11 +297,10 @@ equal to that of the currently checked out branch.</p>
 working tree to it; use "git checkout &lt;newbranch&gt;" to switch to the\r
 new branch.</p>\r
 <p>When a local branch is started off a remote branch, git sets up the\r
-branch so that <a href="git-pull.html">git-pull(1)</a> will appropriately merge from that\r
-remote branch.  If this behavior is not desired, it is possible to\r
-disable it using the global <tt>branch.autosetupmerge</tt> configuration\r
-flag.  That setting can be overridden by using the <tt>--track</tt>\r
-and <tt>--no-track</tt> options.</p>\r
+branch so that <a href="git-pull.html">git-pull(1)</a> will appropriately merge from\r
+the remote branch. This behavior may be changed via the global\r
+<tt>branch.autosetupmerge</tt> configuration flag. That setting can be\r
+overridden by using the <tt>--track</tt> and <tt>--no-track</tt> options.</p>\r
 <p>With a <em>-m</em> or <em>-M</em> option, &lt;oldbranch&gt; will be renamed to &lt;newbranch&gt;.\r
 If &lt;oldbranch&gt; had a corresponding reflog, it is renamed to match\r
 &lt;newbranch&gt;, and a reflog entry is created to remember the branch\r
@@ -433,14 +432,16 @@ clean up all obsolete remote-tracking branches.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Set up configuration so that git-pull will automatically\r
-        retrieve data from the remote branch.  Use this if you always\r
-        pull from the same remote branch into the new branch, or if you\r
-        don't want to use "git pull &lt;repository&gt; &lt;refspec&gt;" explicitly.\r
-        This behavior is the default.  Set the\r
-        branch.autosetupmerge configuration variable to false if you\r
-        want git-checkout and git-branch to always behave as if\r
-        <em>--no-track</em> were given.\r
+        When creating a new branch, set up configuration so that git-pull\r
+        will automatically retrieve data from the start point, which must be\r
+        a branch. Use this if you always pull from the same upstream branch\r
+        into the new branch, and if you don't want to use "git pull\r
+        &lt;repository&gt; &lt;refspec&gt;" explicitly. This behavior is the default\r
+        when the start point is a remote branch. Set the\r
+        branch.autosetupmerge configuration variable to <tt>false</tt> if you want\r
+        git-checkout and git-branch to always behave as if <em>--no-track</em> were\r
+        given. Set it to <tt>always</tt> if you want this behavior when the\r
+        start-point is either a local or remote branch.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -448,10 +449,7 @@ clean up all obsolete remote-tracking branches.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        When a branch is created off a remote branch,\r
-        set up configuration so that git-pull will not retrieve data\r
-        from the remote branch, ignoring the branch.autosetupmerge\r
-        configuration variable.\r
+        Ignore the branch.autosetupmerge configuration variable.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -566,7 +564,7 @@ a branch and check it out with a single command.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 12-Feb-2008 03:18:04 UTC\r
+Last updated 28-Feb-2008 00:25:37 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-branch.txt b/git-branch.txt
index 7e8874acaacbd6990ccaf66d5bddbff6e4c1e5ba..6f07a17a2c310a67f23034c520ab10670407c006 100644 (file)
--- a/git-branch.txt
+++ b/git-branch.txt
@@ -35,11 +35,10 @@ working tree to it; use "git checkout <newbranch>" to switch to the
 new branch.
 
 When a local branch is started off a remote branch, git sets up the
-branch so that linkgit:git-pull[1] will appropriately merge from that
-remote branch.  If this behavior is not desired, it is possible to
-disable it using the global `branch.autosetupmerge` configuration
-flag.  That setting can be overridden by using the `--track`
-and `--no-track` options.
+branch so that linkgit:git-pull[1] will appropriately merge from
+the remote branch. This behavior may be changed via the global
+`branch.autosetupmerge` configuration flag. That setting can be
+overridden by using the `--track` and `--no-track` options.
 
 With a '-m' or '-M' option, <oldbranch> will be renamed to <newbranch>.
 If <oldbranch> had a corresponding reflog, it is renamed to match
@@ -105,20 +104,19 @@ OPTIONS
        Display the full sha1s in output listing rather than abbreviating them.
 
 --track::
-       Set up configuration so that git-pull will automatically
-       retrieve data from the remote branch.  Use this if you always
-       pull from the same remote branch into the new branch, or if you
-       don't want to use "git pull <repository> <refspec>" explicitly.
-       This behavior is the default.  Set the
-       branch.autosetupmerge configuration variable to false if you
-       want git-checkout and git-branch to always behave as if
-       '--no-track' were given.
+       When creating a new branch, set up configuration so that git-pull
+       will automatically retrieve data from the start point, which must be
+       a branch. Use this if you always pull from the same upstream branch
+       into the new branch, and if you don't want to use "git pull
+       <repository> <refspec>" explicitly. This behavior is the default
+       when the start point is a remote branch. Set the
+       branch.autosetupmerge configuration variable to `false` if you want
+       git-checkout and git-branch to always behave as if '--no-track' were
+       given. Set it to `always` if you want this behavior when the
+       start-point is either a local or remote branch.
 
 --no-track::
-       When a branch is created off a remote branch,
-       set up configuration so that git-pull will not retrieve data
-       from the remote branch, ignoring the branch.autosetupmerge
-       configuration variable.
+       Ignore the branch.autosetupmerge configuration variable.
 
 <branchname>::
        The name of the branch to create or delete.

diff --git a/git-checkout.html b/git-checkout.html
index 83420b0469b1761be151614375e35976172ce74e..e5a74dd674e5d1213e041044ae028751998ca47e 100644 (file)
--- a/git-checkout.html
+++ b/git-checkout.html
@@ -330,15 +330,16 @@ working tree.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        When -b is given and a branch is created off a remote branch,\r
-        set up configuration so that git-pull will automatically\r
-        retrieve data from the remote branch.  Use this if you always\r
-        pull from the same remote branch into the new branch, or if you\r
-        don't want to use "git pull &lt;repository&gt; &lt;refspec&gt;" explicitly.\r
-        This behavior is the default.  Set the\r
-        branch.autosetupmerge configuration variable to false if you\r
-        want git-checkout and git-branch to always behave as if\r
-        <em>--no-track</em> were given.\r
+        When creating a new branch, set up configuration so that git-pull\r
+        will automatically retrieve data from the start point, which must be\r
+        a branch. Use this if you always pull from the same upstream branch\r
+        into the new branch, and if you don't want to use "git pull\r
+        &lt;repository&gt; &lt;refspec&gt;" explicitly. This behavior is the default\r
+        when the start point is a remote branch. Set the\r
+        branch.autosetupmerge configuration variable to <tt>false</tt> if you want\r
+        git-checkout and git-branch to always behave as if <em>--no-track</em> were\r
+        given. Set it to <tt>always</tt> if you want this behavior when the\r
+        start-point is either a local or remote branch.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -346,10 +347,7 @@ working tree.</p>
 </dt>\r
 <dd>\r
 <p>\r
-        When -b is given and a branch is created off a remote branch,\r
-        set up configuration so that git-pull will not retrieve data\r
-        from the remote branch, ignoring the branch.autosetupmerge\r
-        configuration variable.\r
+        Ignore the branch.autosetupmerge configuration variable.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -541,7 +539,7 @@ $ git add frotz</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 12-Feb-2008 03:18:04 UTC\r
+Last updated 28-Feb-2008 00:25:37 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-checkout.txt b/git-checkout.txt
index b4cfa044bbb969add6f434070a8666fc0c325d15..4014e7256d48262c97a38a543415d5a53f5407b9 100644 (file)
--- a/git-checkout.txt
+++ b/git-checkout.txt
@@ -48,21 +48,19 @@ OPTIONS
        may restrict the characters allowed in a branch name.
 
 --track::
-       When -b is given and a branch is created off a remote branch,
-       set up configuration so that git-pull will automatically
-       retrieve data from the remote branch.  Use this if you always
-       pull from the same remote branch into the new branch, or if you
-       don't want to use "git pull <repository> <refspec>" explicitly.
-       This behavior is the default.  Set the
-       branch.autosetupmerge configuration variable to false if you
-       want git-checkout and git-branch to always behave as if
-       '--no-track' were given.
+       When creating a new branch, set up configuration so that git-pull
+       will automatically retrieve data from the start point, which must be
+       a branch. Use this if you always pull from the same upstream branch
+       into the new branch, and if you don't want to use "git pull
+       <repository> <refspec>" explicitly. This behavior is the default
+       when the start point is a remote branch. Set the
+       branch.autosetupmerge configuration variable to `false` if you want
+       git-checkout and git-branch to always behave as if '--no-track' were
+       given. Set it to `always` if you want this behavior when the
+       start-point is either a local or remote branch.
 
 --no-track::
-       When -b is given and a branch is created off a remote branch,
-       set up configuration so that git-pull will not retrieve data
-       from the remote branch, ignoring the branch.autosetupmerge
-       configuration variable.
+       Ignore the branch.autosetupmerge configuration variable.
 
 -l::
        Create the new branch's reflog.  This activates recording of

diff --git a/git-clone.html b/git-clone.html
index 737769d391f0ad81fdb34f62fb970aae5c7f0dc8..958f9776c08ade7cfe2ef86a8adcdf5877dde44d 100644 (file)
--- a/git-clone.html
+++ b/git-clone.html
@@ -573,6 +573,24 @@ file:///path/to/repo.git/
 </ul>\r
 </div></div>\r
 <p>They are equivalent, except the former implies --local option.</p>\r
+<p>If there are a large number of similarly-named remote repositories and\r
+you want to use a different format for them (such that the URLs you\r
+use will be rewritten into URLs that work), you can create a\r
+configuration section of the form:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>        [url "&lt;actual url base&gt;"]\r
+                insteadOf = &lt;other url base&gt;</tt></pre>\r
+</div></div>\r
+<p>For example, with this:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>        [url "git://git.host.xz/"]\r
+                insteadOf = host.xz:/path/to/\r
+                insteadOf = work:</tt></pre>\r
+</div></div>\r
+<p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be\r
+rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p>\r
 </div>\r
 <h2>Examples</h2>\r
 <div class="sectionbody">\r
@@ -646,7 +664,7 @@ Create a repository on the kernel.org machine that borrows from Linus
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 14-Feb-2008 00:51:07 UTC\r
+Last updated 28-Feb-2008 00:25:37 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-config.html b/git-config.html
index d380da135e8f9c8a55befaa9ad323b041e3fe1b0..c826e1a0b459acfa489882229bec17e7ed59c6f5 100644 (file)
--- a/git-config.html
+++ b/git-config.html
@@ -1204,10 +1204,14 @@ branch.autosetupmerge
 <dd>\r
 <p>\r
         Tells <tt>git-branch</tt> and <tt>git-checkout</tt> to setup new branches\r
-        so that <a href="git-pull.html">git-pull(1)</a> will appropriately merge from that\r
-        remote branch.  Note that even if this option is not set,\r
+        so that <a href="git-pull.html">git-pull(1)</a> will appropriately merge from the\r
+        starting point branch. Note that even if this option is not set,\r
         this behavior can be chosen per-branch using the <tt>--track</tt>\r
-        and <tt>--no-track</tt> options.  This option defaults to true.\r
+        and <tt>--no-track</tt> options. The valid settings are: <tt>false</tt> &#8212; no\r
+        automatic setup is done; <tt>true</tt> &#8212; automatic setup is done when the\r
+        starting point is a remote branch; <tt>always</tt> &#8212; automatic setup is\r
+        done when the starting point is either a local branch or remote\r
+        branch. This option defaults to true.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -2002,6 +2006,8 @@ pack.threads
         warning. This is meant to reduce packing time on multiprocessor\r
         machines. The required amount of memory for the delta search window\r
         is however multiplied by the number of threads.\r
+        Specifying 0 will cause git to auto-detect the number of CPU's\r
+        and set the number of threads accordingly.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -2175,6 +2181,22 @@ tar.umask
 </p>\r
 </dd>\r
 <dt>\r
+url.&lt;base&gt;.insteadOf\r
+</dt>\r
+<dd>\r
+<p>\r
+        Any URL that starts with this value will be rewritten to\r
+        start, instead, with &lt;base&gt;. In cases where some site serves a\r
+        large number of repositories, and serves them with multiple\r
+        access methods, and some users need to use different access\r
+        methods, this feature allows people to specify any of the\r
+        equivalent URLs and have git automatically rewrite the URL to\r
+        the best alternative for the particular user, even for a\r
+        never-before-seen repository on the site.  When more than one\r
+        insteadOf strings match a given URL, the longest match is used.\r
+</p>\r
+</dd>\r
+<dt>\r
 user.email\r
 </dt>\r
 <dd>\r
@@ -2286,7 +2308,7 @@ web.browser
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 25-Feb-2008 08:40:21 UTC\r
+Last updated 28-Feb-2008 00:25:38 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-describe.html b/git-describe.html
index 7c33eeacac47acc34ebc6431fbc4afc01610b1af..6e851d7d6abbcb249defa2a8d7038d996ffad029 100644 (file)
--- a/git-describe.html
+++ b/git-describe.html
@@ -338,6 +338,16 @@ additional commits and the abbreviated object name of the commit.</p>
         candidates to describe the input committish consider\r
         up to &lt;n&gt; candidates.  Increasing &lt;n&gt; above 10 will take\r
         slightly longer but may produce a more accurate result.\r
+        An &lt;n&gt; of 0 will cause only exact matches to be output.\r
+</p>\r
+</dd>\r
+<dt>\r
+--exact-match\r
+</dt>\r
+<dd>\r
+<p>\r
+        Only output exact matches (a tag directly references the\r
+        supplied commit).  This is a synonym for --candidates=0.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -437,7 +447,7 @@ updated by Shawn Pearce &lt;spearce@spearce.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 12-Feb-2008 03:18:05 UTC\r
+Last updated 28-Feb-2008 00:25:38 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-describe.txt b/git-describe.txt
index 1c3dfb40c63350651efb570ed540b69c34ccbc81..fbb40a29165a47e627358b5b9f8afb50e84958cd 100644 (file)
--- a/git-describe.txt
+++ b/git-describe.txt
@@ -45,6 +45,11 @@ OPTIONS
        candidates to describe the input committish consider
        up to <n> candidates.  Increasing <n> above 10 will take
        slightly longer but may produce a more accurate result.
+       An <n> of 0 will cause only exact matches to be output.
+
+--exact-match::
+       Only output exact matches (a tag directly references the
+       supplied commit).  This is a synonym for --candidates=0.
 
 --debug::
        Verbosely display information about the searching strategy

diff --git a/git-diff-files.html b/git-diff-files.html
index 585729d692305c6e94ada6bb9da8ae325170648c..2e44b69189b9a3857141faa740a3a21f6e181f40 100644 (file)
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -601,6 +601,19 @@ same as "git-diff-index" and "git-diff-tree".</p>
 </p>\r
 </dd>\r
 <dt>\r
+--relative[=&lt;path&gt;]\r
+</dt>\r
+<dd>\r
+<p>\r
+        When run from a subdirectory of the project, it can be\r
+        told to exclude changes outside the directory and show\r
+        pathnames relative to it with this option.  When you are\r
+        not in a subdirectory (e.g. in a bare repository), you\r
+        can name which subdirectory to make the output relative\r
+        to by giving a &lt;path&gt; as an argument.\r
+</p>\r
+</dd>\r
+<dt>\r
 --text\r
 </dt>\r
 <dd>\r
@@ -1261,7 +1274,7 @@ the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:13 UTC\r
+Last updated 28-Feb-2008 00:25:38 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-index.html b/git-diff-index.html
index c3338948cb923a9dabea9265e6727cc237169123..37b68cbc4274cc3ea078a400706f13aa09b51e3b 100644 (file)
--- a/git-diff-index.html
+++ b/git-diff-index.html
@@ -602,6 +602,19 @@ entries in the index are compared.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--relative[=&lt;path&gt;]\r
+</dt>\r
+<dd>\r
+<p>\r
+        When run from a subdirectory of the project, it can be\r
+        told to exclude changes outside the directory and show\r
+        pathnames relative to it with this option.  When you are\r
+        not in a subdirectory (e.g. in a bare repository), you\r
+        can name which subdirectory to make the output relative\r
+        to by giving a &lt;path&gt; as an argument.\r
+</p>\r
+</dd>\r
+<dt>\r
 --text\r
 </dt>\r
 <dd>\r
@@ -1343,7 +1356,7 @@ always have the special all-zero sha1.</td>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:13 UTC\r
+Last updated 28-Feb-2008 00:25:39 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-tree.html b/git-diff-tree.html
index 09afd553a8daed3669c5099cf8c6814564c7e0c5..053b7dbf140871630eba1ce01aa2ad9fae2c2071 100644 (file)
--- a/git-diff-tree.html
+++ b/git-diff-tree.html
@@ -604,6 +604,19 @@ git-diff-tree(1) Manual Page
 </p>\r
 </dd>\r
 <dt>\r
+--relative[=&lt;path&gt;]\r
+</dt>\r
+<dd>\r
+<p>\r
+        When run from a subdirectory of the project, it can be\r
+        told to exclude changes outside the directory and show\r
+        pathnames relative to it with this option.  When you are\r
+        not in a subdirectory (e.g. in a bare repository), you\r
+        can name which subdirectory to make the output relative\r
+        to by giving a &lt;path&gt; as an argument.\r
+</p>\r
+</dd>\r
+<dt>\r
 --text\r
 </dt>\r
 <dd>\r
@@ -1731,7 +1744,7 @@ the pathname, but if that is <tt>NUL</tt>, the record will show two paths.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:15 UTC\r
+Last updated 28-Feb-2008 00:25:39 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff.html b/git-diff.html
index 9f1a128494503e0e2d5154a0e2f782d935f67f82..8983b8540669aac80271f28903bd0efc22789af1 100644 (file)
--- a/git-diff.html
+++ b/git-diff.html
@@ -680,6 +680,19 @@ and the range notations ("<commit>..<commit>" and
 </p>\r
 </dd>\r
 <dt>\r
+--relative[=&lt;path&gt;]\r
+</dt>\r
+<dd>\r
+<p>\r
+        When run from a subdirectory of the project, it can be\r
+        told to exclude changes outside the directory and show\r
+        pathnames relative to it with this option.  When you are\r
+        not in a subdirectory (e.g. in a bare repository), you\r
+        can name which subdirectory to make the output relative\r
+        to by giving a &lt;path&gt; as an argument.\r
+</p>\r
+</dd>\r
+<dt>\r
 --text\r
 </dt>\r
 <dd>\r
@@ -1458,7 +1471,7 @@ Output diff in reverse.
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:15 UTC\r
+Last updated 28-Feb-2008 00:25:41 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-fetch.html b/git-fetch.html
index 5b7174aaadd4ea31b5ac5c2fa6eafec6fe448474..a9c34389ec00e25a42b28e7782861134596fcae8 100644 (file)
--- a/git-fetch.html
+++ b/git-fetch.html
@@ -594,6 +594,24 @@ file:///path/to/repo.git/
 </div></div>\r
 <p>They are mostly equivalent, except when cloning.  See\r
 <a href="git-clone.html">git-clone(1)</a> for details.</p>\r
+<p>If there are a large number of similarly-named remote repositories and\r
+you want to use a different format for them (such that the URLs you\r
+use will be rewritten into URLs that work), you can create a\r
+configuration section of the form:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>        [url "&lt;actual url base&gt;"]\r
+                insteadOf = &lt;other url base&gt;</tt></pre>\r
+</div></div>\r
+<p>For example, with this:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>        [url "git://git.host.xz/"]\r
+                insteadOf = host.xz:/path/to/\r
+                insteadOf = work:</tt></pre>\r
+</div></div>\r
+<p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be\r
+rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p>\r
 </div>\r
 <h2>REMOTES</h2>\r
 <div class="sectionbody">\r
@@ -663,7 +681,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 27-Jan-2008 08:23:28 UTC\r
+Last updated 28-Feb-2008 00:25:41 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-format-patch.html b/git-format-patch.html
index cf1875e270fafb01a8072fb6e3ac67c271c8371d..e149dd00eee331328c7faa16b7f3f7766b967a29 100644 (file)
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -281,6 +281,8 @@ git-format-patch(1) Manual Page
                    [--in-reply-to=Message-Id] [--suffix=.<sfx>]\r
                    [--ignore-if-in-upstream]\r
                    [--subject-prefix=Subject-Prefix]\r
+                   [--cc=<email>]\r
+                   [--cover-letter]\r
                    [ &lt;since&gt; | &lt;revision range&gt; ]</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
@@ -648,6 +650,19 @@ reference.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--relative[=&lt;path&gt;]\r
+</dt>\r
+<dd>\r
+<p>\r
+        When run from a subdirectory of the project, it can be\r
+        told to exclude changes outside the directory and show\r
+        pathnames relative to it with this option.  When you are\r
+        not in a subdirectory (e.g. in a bare repository), you\r
+        can name which subdirectory to make the output relative\r
+        to by giving a &lt;path&gt; as an argument.\r
+</p>\r
+</dd>\r
+<dt>\r
 --text\r
 </dt>\r
 <dd>\r
@@ -913,6 +928,25 @@ reference.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--cc=&lt;email&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        Add a "Cc:" header to the email headers. This is in addition\r
+        to any configured headers, and may be used multiple times.\r
+</p>\r
+</dd>\r
+<dt>\r
+--cover-letter\r
+</dt>\r
+<dd>\r
+<p>\r
+        Generate a cover letter template.  You still have to fill in\r
+        a description, but the shortlog and the diffstat will be\r
+        generated for you.\r
+</p>\r
+</dd>\r
+<dt>\r
 --suffix=.&lt;sfx&gt;\r
 </dt>\r
 <dd>\r
@@ -1017,7 +1051,7 @@ git-format-patch -3
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 07-Jan-2008 07:50:21 UTC\r
+Last updated 28-Feb-2008 00:25:42 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-format-patch.txt b/git-format-patch.txt
index 651efe6ca16a02841c49f4b6a57ae2cf5ae8183d..b5207b76040d02e34452175779340658b943a84e 100644 (file)
--- a/git-format-patch.txt
+++ b/git-format-patch.txt
@@ -10,13 +10,15 @@ SYNOPSIS
 --------
 [verse]
 'git-format-patch' [-k] [-o <dir> | --stdout] [--thread]
-                   [--attach[=<boundary>] | --inline[=<boundary>]]
-                   [-s | --signoff] [<common diff options>]
-                   [-n | --numbered | -N | --no-numbered]
-                   [--start-number <n>] [--numbered-files]
-                   [--in-reply-to=Message-Id] [--suffix=.<sfx>]
-                   [--ignore-if-in-upstream]
-                   [--subject-prefix=Subject-Prefix]
+                  [--attach[=<boundary>] | --inline[=<boundary>]]
+                  [-s | --signoff] [<common diff options>]
+                  [-n | --numbered | -N | --no-numbered]
+                  [--start-number <n>] [--numbered-files]
+                  [--in-reply-to=Message-Id] [--suffix=.<sfx>]
+                  [--ignore-if-in-upstream]
+                  [--subject-prefix=Subject-Prefix]
+                  [--cc=<email>]
+                  [--cover-letter]
                   [ <since> | <revision range> ]
 
 DESCRIPTION
@@ -135,6 +137,15 @@ include::diff-options.txt[]
        allows for useful naming of a patch series, and can be
        combined with the --numbered option.
 
+--cc=<email>::
+       Add a "Cc:" header to the email headers. This is in addition
+       to any configured headers, and may be used multiple times.
+
+--cover-letter::
+       Generate a cover letter template.  You still have to fill in
+       a description, but the shortlog and the diffstat will be
+       generated for you.
+
 --suffix=.<sfx>::
        Instead of using `.patch` as the suffix for generated
        filenames, use specified suffix.  A common alternative is

diff --git a/git-log.html b/git-log.html
index ab8cdb1efe25d38e91631a4f285e90aa2398fb3b..0c3eba74d8dd29b5b5ae2120f0f232f08b1ac3a4 100644 (file)
--- a/git-log.html
+++ b/git-log.html
@@ -602,6 +602,19 @@ each commit introduces are shown.</p>
 </p>\r
 </dd>\r
 <dt>\r
+--relative[=&lt;path&gt;]\r
+</dt>\r
+<dd>\r
+<p>\r
+        When run from a subdirectory of the project, it can be\r
+        told to exclude changes outside the directory and show\r
+        pathnames relative to it with this option.  When you are\r
+        not in a subdirectory (e.g. in a bare repository), you\r
+        can name which subdirectory to make the output relative\r
+        to by giving a &lt;path&gt; as an argument.\r
+</p>\r
+</dd>\r
+<dt>\r
 --text\r
 </dt>\r
 <dd>\r
@@ -1043,6 +1056,15 @@ limiting may be applied.</p>
 </p>\r
 </dd>\r
 <dt>\r
+-F, --fixed-strings\r
+</dt>\r
+<dd>\r
+<p>\r
+        Consider the limiting patterns to be fixed strings (don't interpret\r
+        pattern as a regular expression).\r
+</p>\r
+</dd>\r
+<dt>\r
 --remove-empty\r
 </dt>\r
 <dd>\r
@@ -1894,7 +1916,7 @@ reversible operation.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jan-2008 08:01:34 UTC\r
+Last updated 28-Feb-2008 00:25:42 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-pack-objects.html b/git-pack-objects.html
index 7d552499c87ff4b6646ee5781026e2067731363f..c4979609d3d41c2fb17b423f3f2564eaec06c6ac 100644 (file)
--- a/git-pack-objects.html
+++ b/git-pack-objects.html
@@ -530,6 +530,8 @@ base-name
         This is meant to reduce packing time on multiprocessor machines.\r
         The required amount of memory for the delta search window is\r
         however multiplied by the number of threads.\r
+        Specifying 0 will cause git to auto-detect the number of CPU's\r
+        and set the number of threads accordingly.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -564,7 +566,7 @@ base-name
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 10-Feb-2008 10:47:42 UTC\r
+Last updated 28-Feb-2008 00:25:42 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-pack-objects.txt b/git-pack-objects.txt
index 8353be186fcc83092acac16b4fc164d6ea669621..5c1bd3b0813a95ee0c1831a2e10f5512a9330793 100644 (file)
--- a/git-pack-objects.txt
+++ b/git-pack-objects.txt
@@ -177,6 +177,8 @@ base-name::
        This is meant to reduce packing time on multiprocessor machines.
        The required amount of memory for the delta search window is
        however multiplied by the number of threads.
+       Specifying 0 will cause git to auto-detect the number of CPU's
+       and set the number of threads accordingly.
 
 --index-version=<version>[,<offset>]::
        This is intended to be used by the test suite only. It allows

diff --git a/git-pull.html b/git-pull.html
index 0cc70849bfd244b0b6cfc9e6d2ac3dc07809d639..e6d2f821f8c808ac3ce9fa97ad0718c65591cc74 100644 (file)
--- a/git-pull.html
+++ b/git-pull.html
@@ -705,6 +705,24 @@ file:///path/to/repo.git/
 </div></div>\r
 <p>They are mostly equivalent, except when cloning.  See\r
 <a href="git-clone.html">git-clone(1)</a> for details.</p>\r
+<p>If there are a large number of similarly-named remote repositories and\r
+you want to use a different format for them (such that the URLs you\r
+use will be rewritten into URLs that work), you can create a\r
+configuration section of the form:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>        [url "&lt;actual url base&gt;"]\r
+                insteadOf = &lt;other url base&gt;</tt></pre>\r
+</div></div>\r
+<p>For example, with this:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>        [url "git://git.host.xz/"]\r
+                insteadOf = host.xz:/path/to/\r
+                insteadOf = work:</tt></pre>\r
+</div></div>\r
+<p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be\r
+rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p>\r
 </div>\r
 <h2>REMOTES</h2>\r
 <div class="sectionbody">\r
@@ -973,7 +991,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 20-Feb-2008 10:44:09 UTC\r
+Last updated 28-Feb-2008 00:25:43 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-push.html b/git-push.html
index 6ada41e4afde309be498d5662f7cbb9d7171b7fe..0f3679b3f574f34ef7d0dcc7917d50c93d84cde0 100644 (file)
--- a/git-push.html
+++ b/git-push.html
@@ -522,6 +522,24 @@ file:///path/to/repo.git/
 </div></div>\r
 <p>They are mostly equivalent, except when cloning.  See\r
 <a href="git-clone.html">git-clone(1)</a> for details.</p>\r
+<p>If there are a large number of similarly-named remote repositories and\r
+you want to use a different format for them (such that the URLs you\r
+use will be rewritten into URLs that work), you can create a\r
+configuration section of the form:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>        [url "&lt;actual url base&gt;"]\r
+                insteadOf = &lt;other url base&gt;</tt></pre>\r
+</div></div>\r
+<p>For example, with this:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>        [url "git://git.host.xz/"]\r
+                insteadOf = host.xz:/path/to/\r
+                insteadOf = work:</tt></pre>\r
+</div></div>\r
+<p>a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be\r
+rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".</p>\r
 </div>\r
 <h2>REMOTES</h2>\r
 <div class="sectionbody">\r
@@ -709,7 +727,7 @@ by Linus Torvalds &lt;torvalds@osdl.org&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 20-Feb-2008 10:44:09 UTC\r
+Last updated 28-Feb-2008 00:25:43 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-list.html b/git-rev-list.html
index 0173f66cc679ca4b1ba82c7205e0721ea70261a5..bf709ac5a24cb870efdf7f97104e1740c6deb330 100644 (file)
--- a/git-rev-list.html
+++ b/git-rev-list.html
@@ -295,6 +295,7 @@ git-rev-list(1) Manual Page
              [ --(author|committer|grep)=<pattern> ]\r
              [ --regexp-ignore-case | \-i ]\r
              [ --extended-regexp | \-E ]\r
+             [ --fixed-strings | \-F ]\r
              [ --date={local|relative|default|iso|rfc|short} ]\r
              [ [--objects | --objects-edge] [ --unpacked ] ]\r
              [ --pretty | --header ]\r
@@ -596,6 +597,15 @@ limiting may be applied.</p>
 </p>\r
 </dd>\r
 <dt>\r
+-F, --fixed-strings\r
+</dt>\r
+<dd>\r
+<p>\r
+        Consider the limiting patterns to be fixed strings (don't interpret\r
+        pattern as a regular expression).\r
+</p>\r
+</dd>\r
+<dt>\r
 --remove-empty\r
 </dt>\r
 <dd>\r
@@ -1191,7 +1201,7 @@ and the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jan-2008 08:01:34 UTC\r
+Last updated 28-Feb-2008 00:25:44 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rev-list.txt b/git-rev-list.txt
index 5b96eabfce9eecbfccaff16096c616105a040c3d..a8d489f9f29034d732a67375b617f3315109aa05 100644 (file)
--- a/git-rev-list.txt
+++ b/git-rev-list.txt
@@ -31,6 +31,7 @@ SYNOPSIS
             [ \--(author|committer|grep)=<pattern> ]
             [ \--regexp-ignore-case | \-i ]
             [ \--extended-regexp | \-E ]
+            [ \--fixed-strings | \-F ]
             [ \--date={local|relative|default|iso|rfc|short} ]
             [ [\--objects | \--objects-edge] [ \--unpacked ] ]
             [ \--pretty | \--header ]

diff --git a/git-svn.html b/git-svn.html
index dca6f71bef925335ab9e44e17d02c47b57e5d654..c5b2af3a363de50d7ed67728fd1661da49e1c184 100644 (file)
--- a/git-svn.html
+++ b/git-svn.html
@@ -553,6 +553,16 @@ and have no uncommitted changes.</p>
 </p>\r
 </dd>\r
 </dl>\r
+<div class="admonitionblock">\r
+<table><tr>\r
+<td class="icon">\r
+<div class="title">Note</div>\r
+</td>\r
+<td class="content">SVN itself only stores times in UTC and nothing else. The regular svn\r
+client converts the UTC time to the local time (or based on the TZ=\r
+environment). This command has the same behaviour.</td>\r
+</tr></table>\r
+</div>\r
 <p>Any other arguments are passed directly to `git log'</p>\r
 </dd>\r
 <dt>\r
@@ -1085,7 +1095,7 @@ should be manually entered with a text-editor or using
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 12-Feb-2008 03:18:07 UTC\r
+Last updated 28-Feb-2008 00:25:44 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-svn.txt b/git-svn.txt
index 340f1be02a21495182584b0c09512a8608c1a61a..bec9accc8915c712bdea5e8975598e4f26db633f 100644 (file)
--- a/git-svn.txt
+++ b/git-svn.txt
@@ -159,6 +159,10 @@ New features:
        our version of --pretty=oneline
 --
 +
+NOTE: SVN itself only stores times in UTC and nothing else. The regular svn
+client converts the UTC time to the local time (or based on the TZ=
+environment). This command has the same behaviour.
++
 Any other arguments are passed directly to `git log'
 
 'blame'::

diff --git a/rev-list-options.txt b/rev-list-options.txt
index a8138e27a1a10fb0c93608af149ef22323ba9dc5..259072c07883cf15db4162737a63a6506b7443b4 100644 (file)
--- a/rev-list-options.txt
+++ b/rev-list-options.txt
@@ -153,6 +153,11 @@ limiting may be applied.
        Consider the limiting patterns to be extended regular expressions
        instead of the default basic regular expressions.
 
+-F, --fixed-strings::
+
+       Consider the limiting patterns to be fixed strings (don't interpret
+       pattern as a regular expression).
+
 --remove-empty::
 
        Stop when a given path disappears from the tree.

diff --git a/urls.txt b/urls.txt
index 81ac17f32a0587e3d2d41eb8ee89dd85e13f1802..fa34c6747194aaecf9e8124462129b8bbc9ae7d4 100644 (file)
--- a/urls.txt
+++ b/urls.txt
@@ -44,3 +44,26 @@ endif::git-clone[]
 ifdef::git-clone[]
 They are equivalent, except the former implies --local option.
 endif::git-clone[]
+
+
+If there are a large number of similarly-named remote repositories and
+you want to use a different format for them (such that the URLs you
+use will be rewritten into URLs that work), you can create a
+configuration section of the form:
+
+------------
+       [url "<actual url base>"]
+               insteadOf = <other url base>
+------------
+
+For example, with this:
+
+------------
+       [url "git://git.host.xz/"]
+               insteadOf = host.xz:/path/to/
+               insteadOf = work:
+------------
+
+a URL like "work:repo.git" or like "host.xz:/path/to/repo.git" will be
+rewritten in any context that takes a URL to be "git://git.host.xz/repo.git".
+