diff options
Diffstat (limited to 'git-diff.html')
| -rw-r--r-- | git-diff.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/git-diff.html b/git-diff.html index 9081a4d2f..9a8fe99b5 100644 --- a/git-diff.html +++ b/git-diff.html @@ -843,10 +843,10 @@ of <commit> and HEAD. <code>git diff --merge-base A</code> is equivalent <p>
This form is to view the results of a merge commit. The first
listed <commit> must be the merge itself; the remaining two or
- more commits should be its parents. A convenient way to produce
- the desired set of revisions is to use the <code>^@</code> suffix.
- For instance, if <code>master</code> names a merge commit, <code>git diff master
- master^@</code> gives the same combined diff as <code>git show master</code>.
+ more commits should be its parents. Convenient ways to produce
+ the desired set of revisions are to use the suffixes <code>^@</code> and
+ <code>^!</code>. If A is a merge commit, then <code>git diff A A^@</code>,
+ <code>git diff A^!</code> and <code>git show A</code> all give the same combined diff.
</p>
</dd>
<dt class="hdlist1">
@@ -3646,7 +3646,7 @@ diff.colorMovedWS <div id="footer">
<div id="footer-text">
Last updated
- 2022-09-14 13:23:11 PDT
+ 2022-10-26 11:43:43 PDT
</div>
</div>
</body>
|