diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-07-16 01:29:44 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-07-16 01:29:44 +0200 |
| commit | 1863dbdde9dfcea3c51940cc106b699dedbebff8 (patch) | |
| tree | 045f5411d2fa96f810aa11e1c4f93176644a4142 | |
| parent | Merge branch 'sg/commit-graph-progress-fix' into master (diff) | |
| parent | git-diff.txt: reorder possible usages (diff) | |
| download | git-1863dbdde9dfcea3c51940cc106b699dedbebff8.tar.xz git-1863dbdde9dfcea3c51940cc106b699dedbebff8.zip | |
Merge branch 'ct/diff-with-merge-base-clarification' into master
Doc update.
* ct/diff-with-merge-base-clarification:
git-diff.txt: reorder possible usages
git-diff.txt: don't mark required argument as optional
| -rw-r--r-- | Documentation/git-diff.txt | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index 1018110ddc..727f24d16e 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -63,13 +63,7 @@ files on disk. This is to view the changes between two arbitrary <commit>. -'git diff' [<options>] <commit>..<commit> [--] [<path>...]:: - - This is synonymous to the previous form. If <commit> on - one side is omitted, it will have the same effect as - using HEAD instead. - -'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]:: +'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]:: This form is to view the results of a merge commit. The first listed <commit> must be the merge itself; the remaining two or @@ -78,6 +72,13 @@ files on disk. For instance, if `master` names a merge commit, `git diff master master^@` gives the same combined diff as `git show master`. +'git diff' [<options>] <commit>..<commit> [--] [<path>...]:: + + This is synonymous to the earlier form (without the "..") for + viewing the changes between two arbitrary <commit>. If <commit> on + one side is omitted, it will have the same effect as + using HEAD instead. + 'git diff' [<options>] <commit>\...<commit> [--] [<path>...]:: This form is to view the changes on the branch containing |