"Chris Torek via GitGitGadget" <gitgitgadget@xxxxxxxxx> writes:
> From: Chris Torek <chris.torek@xxxxxxxxx>
>
> Update the manual page synopsis to include the three-dot notation
> and the combined-diff option
Surely. That is "tweak ... slightly". Full-stop is missing here,
by the way.
> Make "git diff -h" print the same usage summary as the manual
> page synopsis, minus the "A..B" form, which is now discouraged.
Good.
> Document the usage for producing combined commits.
Yup, that is "while we are at it". The new text reads well, but it
appears that it is the more significant part of the change in this
patch now ;-)
> diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
> index 37781cf1755..0bce278652a 100644
> --- a/Documentation/git-diff.txt
> +++ b/Documentation/git-diff.txt
> @@ -11,15 +11,17 @@ SYNOPSIS
> [verse]
> 'git diff' [<options>] [<commit>] [--] [<path>...]
> 'git diff' [<options>] --cached [<commit>] [--] [<path>...]
> -'git diff' [<options>] <commit> <commit> [--] [<path>...]
> +'git diff' [<options>] <commit> [<commit>...] <commit> [--] [<path>...]
> +'git diff' [<options>] <commit>...<commit> [--] [<path>...]
> 'git diff' [<options>] <blob> <blob>
> 'git diff' [<options>] --no-index [--] <path> <path>
>
> DESCRIPTION
> -----------
> Show changes between the working tree and the index or a tree, changes
> -between the index and a tree, changes between two trees, changes between
> -two blob objects, or changes between two files on disk.
> +between the index and a tree, changes between two trees, changes resulting
> +from a merge, changes between two blob objects, or changes between two
> +files on disk.
>
> 'git diff' [<options>] [--] [<path>...]::
>
> @@ -67,6 +69,16 @@ two blob objects, or changes between two files on disk.
> one side is omitted, it will have the same effect as
> using HEAD instead.
>
> +'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
> + more commits should be its parents. A convenient way to produce
> + the desired set of revisions is to use the {caret}@ suffix, i.e.,
> + "git diff master master^@". This is equivalent to running "git
Don't we usually use `git diff master master^@` to mark up literal
examples with tt, instead of "git diff..." with double-quotes?
> + show --format=" on the merge commit, e.g., "git show --format=
> + master".
Likewise.
But more importantly, I think giving the exact equivalent is much
less important than keeping the explanation concise, simple and
clear, and the "empty format to omit the log part" is distracting
(after all, teaching how to squelch the log message part in the
"show" command is not the topic of this manpage).
For a merge commit `master`, this gives the same combined diff
as `git show master` does.
perhaps?
Thanks.
