Autogenerated HTML docs for v1.5.2-rc0-71-g4342

diff --git a/blame-options.txt b/blame-options.txt
index 331f161c7769dfe5678bb79d11e72427a21f7bec..a46bf6ce703f4bcf8b5f8066a7d7d2c3f21b4ec2 100644 (file)
--- a/blame-options.txt
+++ b/blame-options.txt
@@ -9,8 +9,28 @@
 --show-stats::
        Include additional statistics at the end of blame output.
 
--L n,m::
-       Annotate only the specified line range (lines count from 1).
+-L <start>,<end>::
+       Annotate only the given line range.  <start> and <end> can take
+       one of these forms:
+
+       - number
++
+If <start> or <end> is a number, it specifies an
+absolute line number (lines count from 1).
++
+
+- /regex/
++
+This form will use the first line matching the given
+POSIX regex.  If <end> is a regex, it will search
+starting at the line given by <start>.
++
+
+- +offset or -offset
++
+This is only valid for <end> and will specify a number
+of lines before or after the line given by <start>.
++
 
 -l::
        Show long rev (Default: off).

diff --git a/fetch-options.txt b/fetch-options.txt
index 5b4d184a73d013b8da11db3adb08905c0101bf88..bdc7332c7b11c25957ee170b0582f9fe182755eb 100644 (file)
--- a/fetch-options.txt
+++ b/fetch-options.txt
@@ -1,13 +1,20 @@
+-q, \--quiet::
+       Pass --quiet to git-fetch-pack and silence any other internally
+       used programs.
+
+-v, \--verbose::
+       Be verbose.
+
 -a, \--append::
        Append ref names and object names of fetched refs to the
        existing contents of `.git/FETCH_HEAD`.  Without this
        option old data in `.git/FETCH_HEAD` will be overwritten.
 
 \--upload-pack <upload-pack>::
-        When given, and the repository to fetch from is handled
-        by 'git-fetch-pack', '--exec=<upload-pack>' is passed to
-        the command to specify non-default path for the command
-        run on the other end.
+       When given, and the repository to fetch from is handled
+       by 'git-fetch-pack', '--exec=<upload-pack>' is passed to
+       the command to specify non-default path for the command
+       run on the other end.
 
 -f, \--force::
        When `git-fetch` is used with `<rbranch>:<lbranch>`
@@ -16,7 +23,7 @@
        fetches is a descendant of `<lbranch>`.  This option
        overrides that check.
 
-\--no-tags::
+-n, \--no-tags::
        By default, `git-fetch` fetches tags that point at
        objects that are downloaded from the remote repository
        and stores them locally.  This option disables this

diff --git a/git-annotate.html b/git-annotate.html
index a8a6215b32e0153d23e5a9d5bb8b3762423e7128..3043a7474f4b57c1ffdf9c6458b11475698235fa 100644 (file)
--- a/git-annotate.html
+++ b/git-annotate.html
@@ -309,12 +309,37 @@ which introduced the line. Optionally annotate from a given revision.</p>
 </p>\r
 </dd>\r
 <dt>\r
--L n,m\r
+-L &lt;start&gt;,&lt;end&gt;\r
 </dt>\r
 <dd>\r
 <p>\r
-        Annotate only the specified line range (lines count from 1).\r
+        Annotate only the given line range.  &lt;start&gt; and &lt;end&gt; can take\r
+        one of these forms:\r
 </p>\r
+<ul>\r
+<li>\r
+<p>\r
+number\r
+</p>\r
+<p>If &lt;start&gt; or &lt;end&gt; is a number, it specifies an\r
+absolute line number (lines count from 1).</p>\r
+</li>\r
+<li>\r
+<p>\r
+/regex/\r
+</p>\r
+<p>This form will use the first line matching the given\r
+POSIX regex.  If &lt;end&gt; is a regex, it will search\r
+starting at the line given by &lt;start&gt;.</p>\r
+</li>\r
+<li>\r
+<p>\r
++offset or -offset\r
+</p>\r
+<p>This is only valid for &lt;end&gt; and will specify a number\r
+of lines before or after the line given by &lt;start&gt;.</p>\r
+</li>\r
+</ul>\r
 </dd>\r
 <dt>\r
 -l\r
@@ -435,7 +460,7 @@ commit.</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 17-Apr-2007 08:27:39 UTC\r
+Last updated 27-Apr-2007 08:21:39 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-blame.html b/git-blame.html
index c76fe7618000ecde1bff1b83bbbf2bdb3c465120..03111d1609b1cd7f2b1b036e0f46ca7cfd005754 100644 (file)
--- a/git-blame.html
+++ b/git-blame.html
@@ -327,12 +327,37 @@ ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output</tt></pre>
 </p>\r
 </dd>\r
 <dt>\r
--L n,m\r
+-L &lt;start&gt;,&lt;end&gt;\r
 </dt>\r
 <dd>\r
 <p>\r
-        Annotate only the specified line range (lines count from 1).\r
+        Annotate only the given line range.  &lt;start&gt; and &lt;end&gt; can take\r
+        one of these forms:\r
 </p>\r
+<ul>\r
+<li>\r
+<p>\r
+number\r
+</p>\r
+<p>If &lt;start&gt; or &lt;end&gt; is a number, it specifies an\r
+absolute line number (lines count from 1).</p>\r
+</li>\r
+<li>\r
+<p>\r
+/regex/\r
+</p>\r
+<p>This form will use the first line matching the given\r
+POSIX regex.  If &lt;end&gt; is a regex, it will search\r
+starting at the line given by &lt;start&gt;.</p>\r
+</li>\r
+<li>\r
+<p>\r
++offset or -offset\r
+</p>\r
+<p>This is only valid for &lt;end&gt; and will specify a number\r
+of lines before or after the line given by &lt;start&gt;.</p>\r
+</li>\r
+</ul>\r
 </dd>\r
 <dt>\r
 -l\r
@@ -650,7 +675,7 @@ commit commentary), a blame viewer won't ever care.</td>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 17-Apr-2007 08:27:40 UTC\r
+Last updated 27-Apr-2007 08:21:39 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-files.html b/git-diff-files.html
index 4de4601e2e778b5546e10d09ce25c0305549f269..716c9985ec61989b0f17f4ef3ddffcd00438b31e 100644 (file)
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -272,7 +272,7 @@ git-diff-files(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-diff-files</em> [-q] [-0|-1|-2|-3|-c|--cc|-n|--no-index] [&lt;common diff options&gt;] [&lt;path&gt;&#8230;]</p>\r
+<p><em>git-diff-files</em> [-q] [-0|-1|-2|-3|-c|--cc|--no-index] [&lt;common diff options&gt;] [&lt;path&gt;&#8230;]</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -682,7 +682,7 @@ omit diff output for unmerged entries and just show "Unmerged".</p>
 </p>\r
 </dd>\r
 <dt>\r
-\-n,--no-index\r
+--no-index\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -1029,7 +1029,7 @@ two unresolved merge parents with the working tree file
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:38 UTC\r
+Last updated 27-Apr-2007 08:21:41 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-diff-files.txt b/git-diff-files.txt
index b78c4c64f1b2638b8be42072a0f9a4eab1362f7f..2e1e29ef5ae633a005e35f656f30ce66e343de7a 100644 (file)
--- a/git-diff-files.txt
+++ b/git-diff-files.txt
@@ -8,7 +8,7 @@ git-diff-files - Compares files in the working tree and the index
 
 SYNOPSIS
 --------
-'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc|-n|--no-index] [<common diff options>] [<path>...]
+'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc|--no-index] [<common diff options>] [<path>...]
 
 DESCRIPTION
 -----------
@@ -36,7 +36,7 @@ omit diff output for unmerged entries and just show "Unmerged".
        diff, similar to the way 'diff-tree' shows a merge
        commit with these flags.
 
-\-n,\--no-index::
+--no-index::
        Compare the two given files / directories.
 
 -q::

diff --git a/git-fetch.html b/git-fetch.html
index 547cb1c6ec89e23c419607bcefb03c346c9a0b15..ccb343fa8ca370d0d52c3415d7d3e8bd9bb4bb3b 100644 (file)
--- a/git-fetch.html
+++ b/git-fetch.html
@@ -293,6 +293,23 @@ branches you are not interested in, you will not get them.</p>
 <div class="sectionbody">\r
 <dl>\r
 <dt>\r
+-q, --quiet\r
+</dt>\r
+<dd>\r
+<p>\r
+        Pass --quiet to git-fetch-pack and silence any other internally\r
+        used programs.\r
+</p>\r
+</dd>\r
+<dt>\r
+-v, --verbose\r
+</dt>\r
+<dd>\r
+<p>\r
+        Be verbose.\r
+</p>\r
+</dd>\r
+<dt>\r
 -a, --append\r
 </dt>\r
 <dd>\r
@@ -326,7 +343,7 @@ branches you are not interested in, you will not get them.</p>
 </p>\r
 </dd>\r
 <dt>\r
---no-tags\r
+-n, --no-tags\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -634,7 +651,7 @@ Junio C Hamano &lt;junkio@cox.net&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:41 UTC\r
+Last updated 27-Apr-2007 08:21:40 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html
index 8f300e730818ee8ad940c73570948137bfcec05c..2c143061a288ab4a867237e03cc9d2b699a31aa3 100644 (file)
--- a/git-fmt-merge-msg.html
+++ b/git-fmt-merge-msg.html
@@ -272,7 +272,8 @@ git-fmt-merge-msg(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-fmt-merge-msg</em> &lt;$GIT_DIR/FETCH_HEAD</p>\r
+<p>git-fmt-merge-msg [--summary | --no-summary] &lt;$GIT_DIR/FETCH_HEAD\r
+git-fmt-merge-msg [--summary | --no-summray] -F &lt;file&gt;</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -282,6 +283,53 @@ passed as the <em>&lt;merge-message&gt;</em> argument of <tt>git-merge</tt>.</p>
 <p>This script is intended mostly for internal use by scripts\r
 automatically invoking <tt>git-merge</tt>.</p>\r
 </div>\r
+<h2>OPTIONS</h2>\r
+<div class="sectionbody">\r
+<dl>\r
+<dt>\r
+--summary\r
+</dt>\r
+<dd>\r
+<p>\r
+        In addition to branch names, populate the log message with\r
+        one-line descriptions from the actual commits that are being\r
+        merged.\r
+</p>\r
+</dd>\r
+<dt>\r
+--no-summary\r
+</dt>\r
+<dd>\r
+<p>\r
+        Do not list one-line descriptions from the actual commits being\r
+        merged.\r
+</p>\r
+</dd>\r
+<dt>\r
+--file &lt;file&gt;, -F &lt;file&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        Take the list of merged objects from &lt;file&gt; instead of\r
+        stdin.\r
+</p>\r
+</dd>\r
+</dl>\r
+</div>\r
+<h2>CONFIGURATION</h2>\r
+<div class="sectionbody">\r
+<dl>\r
+<dt>\r
+merge.summary\r
+</dt>\r
+<dd>\r
+<p>\r
+        Whether to include summaries of merged commits in newly\r
+        merge commit messages. False by default.\r
+</p>\r
+</dd>\r
+</dl>\r
+</div>\r
 <h2>SEE ALSO</h2>\r
 <div class="sectionbody">\r
 <p><a href="git-merge.html">git-merge(1)</a></p>\r
@@ -300,7 +348,7 @@ automatically invoking <tt>git-merge</tt>.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:42 UTC\r
+Last updated 27-Apr-2007 08:21:41 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-fmt-merge-msg.txt b/git-fmt-merge-msg.txt
index a70eb3994afd866fd6cee6b2aaed8670ef26e2e5..e560b30c571c793bff428ec32ca510bec7595155 100644 (file)
--- a/git-fmt-merge-msg.txt
+++ b/git-fmt-merge-msg.txt
@@ -8,7 +8,8 @@ git-fmt-merge-msg - Produce a merge commit message
 
 SYNOPSIS
 --------
-'git-fmt-merge-msg' <$GIT_DIR/FETCH_HEAD
+git-fmt-merge-msg [--summary | --no-summary] <$GIT_DIR/FETCH_HEAD
+git-fmt-merge-msg [--summary | --no-summray] -F <file>
 
 DESCRIPTION
 -----------
@@ -19,6 +20,28 @@ passed as the '<merge-message>' argument of `git-merge`.
 This script is intended mostly for internal use by scripts
 automatically invoking `git-merge`.
 
+OPTIONS
+-------
+
+--summary::
+       In addition to branch names, populate the log message with
+       one-line descriptions from the actual commits that are being
+       merged.
+
+--no-summary::
+       Do not list one-line descriptions from the actual commits being
+       merged.
+
+--file <file>, -F <file>::
+       Take the list of merged objects from <file> instead of
+       stdin.
+
+CONFIGURATION
+-------------
+
+merge.summary::
+       Whether to include summaries of merged commits in newly
+       merge commit messages. False by default.
 
 SEE ALSO
 --------

diff --git a/git-grep.html b/git-grep.html
index 2fe9160ca0c68ac46eb810cc98fcf61e6a03bcce..0c07ee6ee149cf960055096a612aff192885982b 100644 (file)
--- a/git-grep.html
+++ b/git-grep.html
@@ -276,12 +276,13 @@ git-grep(1) Manual Page
 <div class="content"><em>git-grep</em> [--cached]\r
            [-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp]\r
            [-v | --invert-match] [-h|-H] [--full-name]\r
-           [-E | --extended-regexp] [-G | --basic-regexp] [-F | --fixed-strings]\r
-           [-n] [-l | --files-with-matches] [-L | --files-without-match]\r
+           [-E | --extended-regexp] [-G | --basic-regexp]\r
+           [-F | --fixed-strings] [-n]\r
+           [-l | --files-with-matches] [-L | --files-without-match]\r
            [-c | --count] [--all-match]\r
            [-A &lt;post-context&gt;] [-B &lt;pre-context&gt;] [-C &lt;context&gt;]\r
-           [-f &lt;file&gt;] [-e] &lt;pattern&gt; [--and|--or|--not|(|)|-e &lt;pattern&gt;&#8230;]\r
-           [&lt;tree&gt;&#8230;]\r
+           [-f &lt;file&gt;] [-e] &lt;pattern&gt;\r
+           [--and|--or|--not|(|)|-e &lt;pattern&gt;&#8230;] [&lt;tree&gt;&#8230;]\r
            [--] [&lt;path&gt;&#8230;]</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
@@ -319,6 +320,14 @@ registered in the index file, or given tree objects.</p>
 </p>\r
 </dd>\r
 <dt>\r
+-I\r
+</dt>\r
+<dd>\r
+<p>\r
+        Don't match the pattern in binary files.\r
+</p>\r
+</dd>\r
+<dt>\r
 -w | --word-regexp\r
 </dt>\r
 <dd>\r
@@ -369,6 +378,15 @@ registered in the index file, or given tree objects.</p>
 </p>\r
 </dd>\r
 <dt>\r
+-F | --fixed-strings\r
+</dt>\r
+<dd>\r
+<p>\r
+        Use fixed strings for patterns (don't interpret pattern\r
+        as a regex).\r
+</p>\r
+</dd>\r
+<dt>\r
 -n\r
 </dt>\r
 <dd>\r
@@ -406,6 +424,14 @@ registered in the index file, or given tree objects.</p>
 </p>\r
 </dd>\r
 <dt>\r
+-&lt;num&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        A shortcut for specifying -C&lt;num&gt;.\r
+</p>\r
+</dd>\r
+<dt>\r
 -f &lt;file&gt;\r
 </dt>\r
 <dd>\r
@@ -502,7 +528,7 @@ revamped by Junio C Hamano.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:44 UTC\r
+Last updated 27-Apr-2007 08:21:41 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-grep.txt b/git-grep.txt
index 0140c8e3580c7be90648f5ea0186a5c925ee1584..c5a5dad1ce27dde6c3846beaf7ab2f7aa8ed81c8 100644 (file)
--- a/git-grep.txt
+++ b/git-grep.txt
@@ -12,12 +12,13 @@ SYNOPSIS
 'git-grep' [--cached]
           [-a | --text] [-I] [-i | --ignore-case] [-w | --word-regexp]
           [-v | --invert-match] [-h|-H] [--full-name]
-          [-E | --extended-regexp] [-G | --basic-regexp] [-F | --fixed-strings]
-          [-n] [-l | --files-with-matches] [-L | --files-without-match]
+          [-E | --extended-regexp] [-G | --basic-regexp]
+          [-F | --fixed-strings] [-n]
+          [-l | --files-with-matches] [-L | --files-without-match]
           [-c | --count] [--all-match]
           [-A <post-context>] [-B <pre-context>] [-C <context>]
-          [-f <file>] [-e] <pattern> [--and|--or|--not|(|)|-e <pattern>...]
-          [<tree>...]
+          [-f <file>] [-e] <pattern>
+          [--and|--or|--not|(|)|-e <pattern>...] [<tree>...]
           [--] [<path>...]
 
 DESCRIPTION
@@ -39,6 +40,9 @@ OPTIONS
        Ignore case differences between the patterns and the
        files.
 
+-I::
+       Don't match the pattern in binary files.
+
 -w | --word-regexp::
        Match the pattern only at word boundary (either begin at the
        beginning of a line, or preceded by a non-word character; end at
@@ -64,6 +68,10 @@ OPTIONS
        Use POSIX extended/basic regexp for patterns.  Default
        is to use basic regexp.
 
+-F | --fixed-strings::
+       Use fixed strings for patterns (don't interpret pattern
+       as a regex).
+
 -n::
        Prefix the line number to matching lines.
 
@@ -81,6 +89,9 @@ OPTIONS
        line containing `--` between contiguous groups of
        matches.
 
+-<num>::
+       A shortcut for specifying -C<num>.
+
 -f <file>::
        Read patterns from <file>, one per line.
 

diff --git a/git-http-fetch.html b/git-http-fetch.html
index 4a9c3a6b191dfc4aa7ee801aeec18d6c0c59b864..3abae837798710c37bb33f798fc15f802615bc89 100644 (file)
--- a/git-http-fetch.html
+++ b/git-http-fetch.html
@@ -344,6 +344,15 @@ commit-id
 <pre><tt>&lt;commit-id&gt;['\t'&lt;filename-as-in--w&gt;]</tt></pre>\r
 </div></div>\r
 </dd>\r
+<dt>\r
+--recover\r
+</dt>\r
+<dd>\r
+<p>\r
+        Verify that everything reachable from target is fetched.  Used after\r
+        an earlier fetch is interrupted.\r
+</p>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2>Author</h2>\r
@@ -360,7 +369,7 @@ commit-id
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:45 UTC\r
+Last updated 27-Apr-2007 08:21:42 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-http-fetch.txt b/git-http-fetch.txt
index 7dc2df3044e82e20fbb99ae86f0a150c08cd027d..4deabc376c6698408bee032409434bd7e32740a4 100644 (file)
--- a/git-http-fetch.txt
+++ b/git-http-fetch.txt
@@ -39,6 +39,10 @@ commit-id::
 
                <commit-id>['\t'<filename-as-in--w>]
 
+--recover::
+       Verify that everything reachable from target is fetched.  Used after
+       an earlier fetch is interrupted.
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org>

diff --git a/git-http-push.html b/git-http-push.html
index 9b8acca5f90a40eedcb6170a3e248622934cb1d9..3fd7de5278d27a8269a1871f628488d35be75a80 100644 (file)
--- a/git-http-push.html
+++ b/git-http-push.html
@@ -272,7 +272,7 @@ git-http-push(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-http-push</em> [--complete] [--force] [--verbose] &lt;url&gt; &lt;ref&gt; [&lt;ref&gt;&#8230;]</p>\r
+<p><em>git-http-push</em> [--all] [--force] [--verbose] &lt;url&gt; &lt;ref&gt; [&lt;ref&gt;&#8230;]</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -283,7 +283,7 @@ remote branch.</p>
 <div class="sectionbody">\r
 <dl>\r
 <dt>\r
---complete\r
+--all\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -314,6 +314,33 @@ remote branch.</p>
 </p>\r
 </dd>\r
 <dt>\r
+-d, -D\r
+</dt>\r
+<dd>\r
+<p>\r
+        Remove &lt;ref&gt; from remote repository.  The specified branch\r
+        cannot be the remote HEAD.  If -d is specified the following\r
+        other conditions must also be met:\r
+</p>\r
+<ul>\r
+<li>\r
+<p>\r
+Remote HEAD must resolve to an object that exists locally\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Specified branch resolves to an object that exists locally\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+Specified branch is an ancestor of the remote HEAD\r
+</p>\r
+</li>\r
+</ul>\r
+</dd>\r
+<dt>\r
 &lt;ref&gt;&#8230;\r
 </dt>\r
 <dd>\r
@@ -385,7 +412,7 @@ to disable the fast-forward check only on that ref.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:46 UTC\r
+Last updated 27-Apr-2007 08:21:43 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-http-push.txt b/git-http-push.txt
index 4b4a46169c79b90e22f5bde0b26888761c28c9c4..a15cf5b2a30a6ed2c207622c767d131346936a06 100644 (file)
--- a/git-http-push.txt
+++ b/git-http-push.txt
@@ -8,7 +8,7 @@ git-http-push - Push objects over HTTP/DAV to another repository
 
 SYNOPSIS
 --------
-'git-http-push' [--complete] [--force] [--verbose] <url> <ref> [<ref>...]
+'git-http-push' [--all] [--force] [--verbose] <url> <ref> [<ref>...]
 
 DESCRIPTION
 -----------
@@ -18,7 +18,7 @@ remote branch.
 
 OPTIONS
 -------
---complete::
+--all::
        Do not assume that the remote repository is complete in its
        current state, and verify all objects in the entire local
        ref's history exist in the remote repository.
@@ -34,6 +34,15 @@ OPTIONS
        Report the list of objects being walked locally and the
        list of objects successfully sent to the remote repository.
 
+-d, -D::
+       Remove <ref> from remote repository.  The specified branch
+       cannot be the remote HEAD.  If -d is specified the following
+       other conditions must also be met:
+
+       - Remote HEAD must resolve to an object that exists locally
+       - Specified branch resolves to an object that exists locally
+       - Specified branch is an ancestor of the remote HEAD
+
 <ref>...::
        The remote refs to update.
 

diff --git a/git-local-fetch.html b/git-local-fetch.html
index b77a46dddaebd4279e839faa365570446752e2be..5fb0d35e7bae5fe56b4fafcd681e8692d67ca99a 100644 (file)
--- a/git-local-fetch.html
+++ b/git-local-fetch.html
@@ -314,6 +314,34 @@ git-local-fetch(1) Manual Page
 </p>\r
 </dd>\r
 <dt>\r
+-s\r
+</dt>\r
+<dd>\r
+<p>\r
+        Instead of regular file-to-file copying use symbolic links to the objects\r
+        in the remote repository.\r
+</p>\r
+</dd>\r
+<dt>\r
+-l\r
+</dt>\r
+<dd>\r
+<p>\r
+        Before attempting symlinks (if -s is specified) or file-to-file copying the\r
+        remote objects, try to hardlink the remote objects into the local\r
+        repository.\r
+</p>\r
+</dd>\r
+<dt>\r
+-n\r
+</dt>\r
+<dd>\r
+<p>\r
+        Never attempt to file-to-file copy remote objects.  Only useful with\r
+        -s or -l command-line options.\r
+</p>\r
+</dd>\r
+<dt>\r
 -w &lt;filename&gt;\r
 </dt>\r
 <dd>\r
@@ -335,6 +363,15 @@ git-local-fetch(1) Manual Page
 <pre><tt>&lt;commit-id&gt;['\t'&lt;filename-as-in--w&gt;]</tt></pre>\r
 </div></div>\r
 </dd>\r
+<dt>\r
+--recover\r
+</dt>\r
+<dd>\r
+<p>\r
+        Verify that everything reachable from target is fetched.  Used after\r
+        an earlier fetch is interrupted.\r
+</p>\r
+</dd>\r
 </dl>\r
 </div>\r
 <h2>Author</h2>\r
@@ -351,7 +388,7 @@ git-local-fetch(1) Manual Page
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 04-Apr-2007 18:33:47 UTC\r
+Last updated 27-Apr-2007 08:21:43 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-local-fetch.txt b/git-local-fetch.txt
index 22048d82bdbff1f8a9d5f9ba312ad15b719afc03..dd9e2387fcca205b2ec80d7f6207ce84c53a7377 100644 (file)
--- a/git-local-fetch.txt
+++ b/git-local-fetch.txt
@@ -24,6 +24,16 @@ OPTIONS
        Get all the objects.
 -v::
        Report what is downloaded.
+-s::
+       Instead of regular file-to-file copying use symbolic links to the objects
+       in the remote repository.
+-l::
+       Before attempting symlinks (if -s is specified) or file-to-file copying the
+       remote objects, try to hardlink the remote objects into the local
+       repository.
+-n::
+       Never attempt to file-to-file copy remote objects.  Only useful with
+       -s or -l command-line options.
 
 -w <filename>::
         Writes the commit-id into the filename under $GIT_DIR/refs/<filename> on
@@ -35,6 +45,10 @@ OPTIONS
 
                <commit-id>['\t'<filename-as-in--w>]
 
+--recover::
+       Verify that everything reachable from target is fetched.  Used after
+       an earlier fetch is interrupted.
+
 Author
 ------
 Written by Junio C Hamano <junkio@cox.net>

diff --git a/git-pull.html b/git-pull.html
index 31eaf60b0edd983de5d0f42ab53687a8e0756370..50e706606e23d7583bfc86467336eec5203f4445 100644 (file)
--- a/git-pull.html
+++ b/git-pull.html
@@ -330,6 +330,23 @@ when merging local branches into the current branch.</p>
 </p>\r
 </dd>\r
 <dt>\r
+-q, --quiet\r
+</dt>\r
+<dd>\r
+<p>\r
+        Pass --quiet to git-fetch-pack and silence any other internally\r
+        used programs.\r
+</p>\r
+</dd>\r
+<dt>\r
+-v, --verbose\r
+</dt>\r
+<dd>\r
+<p>\r
+        Be verbose.\r
+</p>\r
+</dd>\r
+<dt>\r
 -a, --append\r
 </dt>\r
 <dd>\r
@@ -363,7 +380,7 @@ when merging local branches into the current branch.</p>
 </p>\r
 </dd>\r
 <dt>\r
---no-tags\r
+-n, --no-tags\r
 </dt>\r
 <dd>\r
 <p>\r
@@ -870,7 +887,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 04-Apr-2007 18:33:57 UTC\r
+Last updated 27-Apr-2007 08:21:44 UTC\r
 </div>\r
 </div>\r
 </body>\r