diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-15 15:49:03 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-15 15:49:03 +0000 |
| commit | 38ddcce0c19a8eedec7a98bd291f65b2127a82b9 (patch) | |
| tree | bc44e0dbf17d91c4eec1fdc57bafcec5a15f74dc /git-rebase.html | |
| parent | c4b18dd00515b271e8b4e4725ce0d19c4ca41636 (diff) | |
| download | git-htmldocs-38ddcce0c19a8eedec7a98bd291f65b2127a82b9.tar.gz | |
Autogenerated HTML docs for v1.5.6.3-350-g6c11a
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-rebase.html b/git-rebase.html index a2905d502..04fd39f3b 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -337,7 +337,8 @@ in <upstream> are saved to a temporary area. This is the same set of commits that would be shown by <tt>git log <upstream>..HEAD</tt>.</p></div>
<div class="para"><p>The current branch is reset to <upstream>, or <newbase> if the
--onto option was supplied. This has the exact same effect as
-<tt>git reset --hard <upstream></tt> (or <newbase>).</p></div>
+<tt>git reset --hard <upstream></tt> (or <newbase>). ORIG_HEAD is set
+to point at the tip of the branch before the reset.</p></div>
<div class="para"><p>The commits that were previously saved into the temporary area are
then reapplied to the current branch, one by one, in order. Note that
any commits in HEAD which introduce the same textual changes as a commit
@@ -906,7 +907,7 @@ Johannes E. Schindelin <johannes.schindelin@gmx.de></p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-07-06 05:16:57 UTC
+Last updated 2008-07-15 15:48:34 UTC
</div>
</div>
</body>
|