diff options
author | Junio C Hamano <gitster@pobox.com> | 2022-10-26 11:45:56 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-10-26 11:45:56 -0700 |
commit | d1a18b412f9fd2c4d13f93689a937fe88db0751e (patch) | |
tree | 045f13be333ad43245d74e98eda56da40e5a031c /git-diff.txt | |
parent | 3393baa82caf1ef9cfef431d84aff17e9d88076f (diff) | |
download | git-htmldocs-d1a18b412f9fd2c4d13f93689a937fe88db0751e.tar.gz |
Autogenerated HTML docs for v2.38.1-175-gdb29e
Diffstat (limited to 'git-diff.txt')
-rw-r--r-- | git-diff.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-diff.txt b/git-diff.txt index 85ae6d6d0..52b679256 100644 --- a/git-diff.txt +++ b/git-diff.txt @@ -79,10 +79,10 @@ If --merge-base is given, use the merge base of the two commits for the 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 `^@` suffix. - For instance, if `master` names a merge commit, `git diff master - master^@` gives the same combined diff as `git show master`. + more commits should be its parents. Convenient ways to produce + the desired set of revisions are to use the suffixes `^@` and + `^!`. If A is a merge commit, then `git diff A A^@`, + `git diff A^!` and `git show A` all give the same combined diff. 'git diff' [<options>] <commit>..<commit> [--] [<path>...]:: |