diff options
Diffstat (limited to 'git-replay.html')
| -rw-r--r-- | git-replay.html | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/git-replay.html b/git-replay.html index f1cdc57ab..2acbdce0c 100644 --- a/git-replay.html +++ b/git-replay.html @@ -1348,8 +1348,11 @@ See also <a href="git-reflog.html">git-reflog(1)</a>.</p></div> </dt>
<dd>
<p>
- After a failed merge, show refs that touch files having a
- conflict and don’t exist on all heads to merge.
+ Show commits touching conflicted paths in the range <code>HEAD...<other></code>,
+ where <code><other></code> is the first existing pseudoref in <code>MERGE_HEAD</code>,
+ <code>CHERRY_PICK_HEAD</code>, <code>REVERT_HEAD</code> or <code>REBASE_HEAD</code>. Only works
+ when the index has unmerged entries. This option can be used to show
+ relevant commits when resolving conflicts from a 3-way merge.
</p>
</dd>
<dt class="hdlist1">
|