diff options
Diffstat (limited to 'git-merge.html')
| -rw-r--r-- | git-merge.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git-merge.html b/git-merge.html index ef87f6c59..434551199 100644 --- a/git-merge.html +++ b/git-merge.html @@ -779,7 +779,8 @@ from one branch into another.</p></div> <code>topic</code> branch since it diverged from <code>master</code> (i.e., <code>E</code>) until
its current commit (<code>C</code>) on top of <code>master</code>, and record the result
in a new commit along with the names of the two parent commits and
-a log message from the user describing the changes.</p></div>
+a log message from the user describing the changes. Before the operation,
+<code>ORIG_HEAD</code> is set to the tip of the current branch (<code>C</code>).</p></div>
<div class="listingblock">
<div class="content">
<pre><code> A---B---C topic
@@ -2326,7 +2327,7 @@ merge.<driver>.recursive <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-14 13:23:11 PDT
+ 2023-01-21 17:52:14 PST
</div>
</div>
</body>
|