diff options
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/git-rebase.html b/git-rebase.html index ef0720da0..21b0c0c95 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -779,6 +779,18 @@ description on <code>--fork-point</code> below); or by <code>git log HEAD</code> <code>--onto</code> option was supplied. This has the exact same effect as
<code>git reset --hard <upstream></code> (or <code><newbase></code>). <code>ORIG_HEAD</code> is set
to point at the tip of the branch before the reset.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<div class="title">Note</div>
+</td>
+<td class="content"><code>ORIG_HEAD</code> is not guaranteed to still point to the previous branch tip
+at the end of the rebase if other commands that write that pseudo-ref
+(e.g. <code>git reset</code>) are used during the rebase. The previous branch tip,
+however, is accessible using the reflog of the current branch
+(i.e. <code>@{1}</code>, see <a href="gitrevisions.html">gitrevisions(7)</a>).</td>
+</tr></table>
+</div>
<div class="paragraph"><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 <code>HEAD</code> which introduce the same textual changes as a commit
@@ -2765,7 +2777,7 @@ sequence.editor <div id="footer">
<div id="footer-text">
Last updated
- 2022-11-04 21:49:36 PDT
+ 2023-01-21 17:52:14 PST
</div>
</div>
</body>
|