Autogenerated HTML docs for v1.2.4-gb0a3de4

diff --git a/git-ls-files.html b/git-ls-files.html
index ed81380..810e707 100644 (file)
--- a/git-ls-files.html
+++ b/git-ls-files.html
@@ -352,6 +352,14 @@ shown:</p>
 </p>\r
 </dd>\r
 <dt>\r
+--no-empty-directory\r
+</dt>\r
+<dd>\r
+<p>\r
+        Do not list empty directories. Has no effect without --directory.\r
+</p>\r
+</dd>\r
+<dt>\r
 -u|--unmerged\r
 </dt>\r
 <dd>\r
@@ -660,7 +668,7 @@ otherwise, it is a shell glob pattern, suitable for
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 22-Feb-2006 10:44:46 UTC\r
+Last updated 27-Mar-2006 07:50:55 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-ls-files.txt b/git-ls-files.txt
index e813f84..980c5c9 100644 (file)
--- a/git-ls-files.txt
+++ b/git-ls-files.txt
@@ -52,6 +52,9 @@ OPTIONS
        If a whole directory is classified as "other", show just its
        name (with a trailing slash) and not its whole contents.
 
+--no-empty-directory::
+       Do not list empty directories. Has no effect without --directory.
+
 -u|--unmerged::
        Show unmerged files in the output (forces --stage)
 

diff --git a/git-rebase.html b/git-rebase.html
index 91aa5cf..88addf0 100644 (file)
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -316,6 +316,20 @@ git-rebase --onto master~1 master topic</tt></pre>
          /\r
 D---E---F---G master</tt></pre>\r
 </div></div>\r
+<p>In case of conflict, git-rebase will stop at the first problematic commit\r
+and leave conflict markers in the tree.  After resolving the conflict manually\r
+and updating the index with the desired resolution, you can continue the\r
+rebasing process with</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>git am --resolved --3way</tt></pre>\r
+</div></div>\r
+<p>Alternatively, you can undo the git-rebase with</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>git reset --hard ORIG_HEAD\r
+rm -r .dotest</tt></pre>\r
+</div></div>\r
 </div>\r
 <h2>OPTIONS</h2>\r
 <div class="sectionbody">\r
@@ -362,7 +376,7 @@ D---E---F---G master</tt></pre>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 18-Mar-2006 07:45:36 UTC\r
+Last updated 27-Mar-2006 07:50:56 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-rebase.txt b/git-rebase.txt
index b36276c..4a7e67a 100644 (file)
--- a/git-rebase.txt
+++ b/git-rebase.txt
@@ -48,6 +48,18 @@ would be:
              /
     D---E---F---G master
 
+In case of conflict, git-rebase will stop at the first problematic commit
+and leave conflict markers in the tree.  After resolving the conflict manually
+and updating the index with the desired resolution, you can continue the
+rebasing process with
+
+    git am --resolved --3way
+
+Alternatively, you can undo the git-rebase with
+
+    git reset --hard ORIG_HEAD
+    rm -r .dotest
+
 OPTIONS
 -------
 <newbase>::