diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-16 03:23:57 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-16 03:23:57 +0000 |
| commit | f5a9362a72a5a586926fce49c90c93a75cbad2b5 (patch) | |
| tree | d4750ea1466329b97186f9eac8f898611a6fbbad /git-rebase.html | |
| parent | 38ddcce0c19a8eedec7a98bd291f65b2127a82b9 (diff) | |
| download | git-htmldocs-f5a9362a72a5a586926fce49c90c93a75cbad2b5.tar.gz | |
Autogenerated HTML docs for v1.5.6.3-384-gfcab4
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-rebase.html b/git-rebase.html index 04fd39f3b..13743b180 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -348,7 +348,7 @@ with a different commit message or timestamp will be skipped).</p></div> completely automatic. You will have to resolve any such merge failure
and run <tt>git rebase --continue</tt>. Another option is to bypass the commit
that caused the merge failure with <tt>git rebase --skip</tt>. To restore the
-original <branch> and remove the .dotest working files, use the command
+original <branch> and remove the .git/rebase working files, use the command
<tt>git rebase --abort</tt> instead.</p></div>
<div class="para"><p>Assume the following history exists and the current branch is "topic":</p></div>
<div class="listingblock">
@@ -907,7 +907,7 @@ Johannes E. Schindelin <johannes.schindelin@gmx.de></p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-07-15 15:48:34 UTC
+Last updated 2008-07-16 03:23:20 UTC
</div>
</div>
</body>
|