Autogenerated HTML docs for v1.5.0-rc3-80-g35ce

diff --git a/git-blame.html b/git-blame.html
index b10a5dad76d5f9bce30e4847ba968fd719011396..ebdf9b84e258c3f38e1ba5e2e3ba6fb41522a30e 100644 (file)
--- a/git-blame.html
+++ b/git-blame.html
@@ -274,7 +274,7 @@ git-blame(1) Manual Page
 <div class="sectionbody">\r
 <div class="verseblock">\r
 <div class="content"><em>git-blame</em> [-c] [-l] [-t] [-f] [-n] [-p] [--incremental] [-L n,m] [-S &lt;revs-file&gt;]\r
-            [-M] [-C] [-C] [--since=&lt;date&gt;] [&lt;rev&gt;] [--] &lt;file&gt;</div></div>\r
+            [-M] [-C] [-C] [--since=&lt;date&gt;] [&lt;rev&gt; | --contents &lt;file&gt;] [--] &lt;file&gt;</div></div>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -375,6 +375,18 @@ ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output</tt></pre>
 </p>\r
 </dd>\r
 <dt>\r
+--contents &lt;file&gt;\r
+</dt>\r
+<dd>\r
+<p>\r
+        When &lt;rev&gt; is not specified, the command annotates the\r
+        changes starting backwards from the working tree copy.\r
+        This flag makes the command pretend as if the working\r
+        tree copy has the contents of he named file (specify\r
+        <tt>-</tt> to make the command read from the standard input).\r
+</p>\r
+</dd>\r
+<dt>\r
 -M\r
 </dt>\r
 <dd>\r
@@ -583,7 +595,7 @@ commit commentary), a blame viewer won't ever care.</td>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 28-Jan-2007 20:55:10 UTC\r
+Last updated 06-Feb-2007 00:09:23 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-blame.txt b/git-blame.txt
index 0ee887d73c704fc877db845b6f5f7ab3b9b10363..5c9888d0143ec8e6c8f7c6782139cde38a25ff17 100644 (file)
--- a/git-blame.txt
+++ b/git-blame.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git-blame' [-c] [-l] [-t] [-f] [-n] [-p] [--incremental] [-L n,m] [-S <revs-file>]
-            [-M] [-C] [-C] [--since=<date>] [<rev>] [--] <file>
+            [-M] [-C] [-C] [--since=<date>] [<rev> | --contents <file>] [--] <file>
 
 DESCRIPTION
 -----------
@@ -67,6 +67,13 @@ OPTIONS
        Show the result incrementally in a format designed for
        machine consumption.
 
+--contents <file>::
+       When <rev> is not specified, the command annotates the
+       changes starting backwards from the working tree copy.
+       This flag makes the command pretend as if the working
+       tree copy has the contents of he named file (specify
+       `-` to make the command read from the standard input).
+
 -M::
        Detect moving lines in the file as well.  When a commit
        moves a block of lines in a file (e.g. the original file

diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html
index f84d404238da98c217928e7e883fe6d7000be827..84a16d0709e97aa1d6df7b241149e9af7e0c871e 100644 (file)
--- a/git-cvsexportcommit.html
+++ b/git-cvsexportcommit.html
@@ -272,7 +272,7 @@ git-cvsexportcommit(1) Manual Page
 </div>\r
 <h2>SYNOPSIS</h2>\r
 <div class="sectionbody">\r
-<p><em>git-cvsexportcommit</em> [-h] [-v] [-c] [-p] [-a] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID</p>\r
+<p><em>git-cvsexportcommit</em> [-h] [-v] [-c] [-P] [-p] [-a] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID</p>\r
 </div>\r
 <h2>DESCRIPTION</h2>\r
 <div class="sectionbody">\r
@@ -326,6 +326,14 @@ should the changeset be done against.</p>
 </p>\r
 </dd>\r
 <dt>\r
+-P\r
+</dt>\r
+<dd>\r
+<p>\r
+        Force the parent commit, even if it is not a direct parent.\r
+</p>\r
+</dd>\r
+<dt>\r
 -m\r
 </dt>\r
 <dd>\r
@@ -386,7 +394,7 @@ $ git-cherry cvshead myhead | sed -n 's/^+ //p' | xargs -l1 git-cvsexportcommit
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jan-2007 00:37:16 UTC\r
+Last updated 06-Feb-2007 00:09:24 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-cvsexportcommit.txt b/git-cvsexportcommit.txt
index 347cbcec353f0ed82e1bdc57766610e6251d7f96..27d531b888ef0468022e2ec0780729acc5151147 100644 (file)
--- a/git-cvsexportcommit.txt
+++ b/git-cvsexportcommit.txt
@@ -8,7 +8,7 @@ git-cvsexportcommit - Export a single commit to a CVS checkout
 
 SYNOPSIS
 --------
-'git-cvsexportcommit' [-h] [-v] [-c] [-p] [-a] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID
+'git-cvsexportcommit' [-h] [-v] [-c] [-P] [-p] [-a] [-f] [-m msgprefix] [PARENTCOMMIT] COMMITID
 
 
 DESCRIPTION
@@ -46,6 +46,9 @@ OPTIONS
 -f::
        Force the merge even if the files are not up to date.
 
+-P::
+       Force the parent commit, even if it is not a direct parent.
+
 -m::
        Prepend the commit message with the provided prefix. 
        Useful for patch series and the like.

diff --git a/git-for-each-ref.html b/git-for-each-ref.html
index 029b2c1ae793a3bb2f0f5b784d4b28b2c1d60014..598c5385ae0ec1060e39fee7be8da626cd5ca0a1 100644 (file)
--- a/git-for-each-ref.html
+++ b/git-for-each-ref.html
@@ -359,7 +359,7 @@ refname
 </dt>\r
 <dd>\r
 <p>\r
-        The name of the ref (the part after $GIT_DIR/refs/).\r
+        The name of the ref (the part after $GIT_DIR/).\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -488,7 +488,7 @@ eval "$eval"</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 29-Jan-2007 02:55:07 UTC\r
+Last updated 06-Feb-2007 00:09:24 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-for-each-ref.txt b/git-for-each-ref.txt
index da52eba7b3619667537c1df3c58a927010f1c8ab..f49b0d944c613a9d5f4a6c5b6713d5c556f0390e 100644 (file)
--- a/git-for-each-ref.txt
+++ b/git-for-each-ref.txt
@@ -66,7 +66,7 @@ keys.
 For all objects, the following names can be used:
 
 refname::
-       The name of the ref (the part after $GIT_DIR/refs/).
+       The name of the ref (the part after $GIT_DIR/).
 
 objecttype::
        The type of the object (`blob`, `tree`, `commit`, `tag`).

diff --git a/git-rebase.html b/git-rebase.html
index 46b55d3d0934ac8cbabff60f7a9e781e6a9bf0d8..5cd948bde22bac700a86454945848a78d2fbafa0 100644 (file)
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -367,6 +367,25 @@ branch.  If we have the following situation:</p>
     A---B---C---D  master</tt></pre>\r
 </div></div>\r
 <p>This is useful when topicB does not depend on topicA.</p>\r
+<p>A range of commits could also be removed with rebase.  If we have\r
+the following situation:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>    E---F---G---H---I---J  topicA</tt></pre>\r
+</div></div>\r
+<p>then the command</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>git-rebase --onto topicA~5 topicA~2 topicA</tt></pre>\r
+</div></div>\r
+<p>would result in the removal of commits F and G:</p>\r
+<div class="listingblock">\r
+<div class="content">\r
+<pre><tt>    E---H'---I'---J'  topicA</tt></pre>\r
+</div></div>\r
+<p>This is useful if F and G were flawed in some way, or should not be\r
+part of topicA.  Note that the argument to --onto and the &lt;upstream&gt;\r
+parameter can be any valid commit-ish.</p>\r
 <p>In case of conflict, git-rebase will stop at the first problematic commit\r
 and leave conflict markers in the tree.  You can use git diff to locate\r
 the markers (&lt;&lt;&lt;&lt;&lt;&lt;) and make edits to resolve the conflict.  For each\r
@@ -398,7 +417,8 @@ desired resolution, you can continue the rebasing process with</p>
 <p>\r
         Starting point at which to create the new commits. If the\r
         --onto option is not specified, the starting point is\r
-        &lt;upstream&gt;.\r
+        &lt;upstream&gt;.  May be any valid commit, and not just an\r
+        existing branch name.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -406,7 +426,8 @@ desired resolution, you can continue the rebasing process with</p>
 </dt>\r
 <dd>\r
 <p>\r
-        Upstream branch to compare against.\r
+        Upstream branch to compare against.  May be any valid commit,\r
+        not just an existing branch name.\r
 </p>\r
 </dd>\r
 <dt>\r
@@ -559,7 +580,7 @@ a rebase.  Upon completion, &lt;branch&gt; will be the current branch.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 19-Jan-2007 00:37:29 UTC\r
+Last updated 06-Feb-2007 00:09:25 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rebase.txt b/git-rebase.txt
index 0cb9e1f10a26866eb0c908ed9a6f7a81d23532e7..977f661b9d7a1b92d27959429c48450a416c08b8 100644 (file)
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -114,6 +114,27 @@ would result in:
 
 This is useful when topicB does not depend on topicA.
 
+A range of commits could also be removed with rebase.  If we have
+the following situation:
+
+------------
+    E---F---G---H---I---J  topicA
+------------
+
+then the command
+
+    git-rebase --onto topicA~5 topicA~2 topicA
+
+would result in the removal of commits F and G:
+
+------------
+    E---H'---I'---J'  topicA
+------------
+
+This is useful if F and G were flawed in some way, or should not be
+part of topicA.  Note that the argument to --onto and the <upstream>
+parameter can be any valid commit-ish.
+
 In case of conflict, git-rebase will stop at the first problematic commit
 and leave conflict markers in the tree.  You can use git diff to locate
 the markers (<<<<<<) and make edits to resolve the conflict.  For each
@@ -141,10 +162,12 @@ OPTIONS
 <newbase>::
        Starting point at which to create the new commits. If the
        --onto option is not specified, the starting point is
-       <upstream>.
+       <upstream>.  May be any valid commit, and not just an
+       existing branch name.
 
 <upstream>::
-       Upstream branch to compare against.
+       Upstream branch to compare against.  May be any valid commit,
+       not just an existing branch name.
 
 <branch>::
        Working branch; defaults to HEAD.

diff --git a/git-tools.html b/git-tools.html
index 2eacea22d98ab5a6ba588870e58056009e191773..208c494517429fe260944a250c8c8232200e8d18 100644 (file)
--- a/git-tools.html
+++ b/git-tools.html
@@ -387,6 +387,18 @@ branch and git.</tt></pre>
 series in git back and forth.</tt></pre>\r
 </div></div>\r
 </li>\r
+<li>\r
+<p>\r
+<strong>hg-to-git</strong> (contrib/)\r
+</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>hg-to-git converts a Mercurial repository into a git one, and\r
+preserves the full branch history in the process. hg-to-git can\r
+also be used in an incremental way to keep the git repository\r
+in sync with the master Mercurial repository.</tt></pre>\r
+</div></div>\r
+</li>\r
 </ul>\r
 </div>\r
 <h2>Others</h2>\r
@@ -421,7 +433,7 @@ comprehensive list.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 17-Jan-2007 17:42:22 UTC\r
+Last updated 06-Feb-2007 00:09:28 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-tools.txt b/git-tools.txt
index 6b407f9adf86ee7d9a82e1c45b202ce67bb15e2b..10653ff898c2278f127f097ddf4a79db5615c802 100644 (file)
--- a/git-tools.txt
+++ b/git-tools.txt
@@ -86,6 +86,14 @@ Foreign SCM interface
    series in git back and forth.
 
 
+   - *hg-to-git* (contrib/)
+
+   hg-to-git converts a Mercurial repository into a git one, and
+   preserves the full branch history in the process. hg-to-git can
+   also be used in an incremental way to keep the git repository
+   in sync with the master Mercurial repository.
+
+
 Others
 ------
 

diff --git a/git.html b/git.html
index 42e8a5978f0400dcb23a7e947ca5cb8bb0fd7b49..065f21a92574d1794c0d63064a1b086a92721c02 100644 (file)
--- a/git.html
+++ b/git.html
@@ -2288,7 +2288,7 @@ contributors on the git-list &lt;git@vger.kernel.org&gt;.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 05-Feb-2007 07:21:37 UTC\r
+Last updated 06-Feb-2007 00:09:25 UTC\r
 </div>\r
 </div>\r
 </body>\r