Simon Ruderich <simon@xxxxxxxxxxxx> writes:
> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
> index 104579d..cd35ec7 100644
> --- a/Documentation/diff-options.txt
> +++ b/Documentation/diff-options.txt
> @@ -24,6 +24,10 @@ ifndef::git-format-patch[]
> --patch::
> Generate patch (see section on generating patches).
> {git-diff? This is the default.}
> +ifdef::git-log[]
> + Changes introduced in merge commits are not displayed. Use `-c`,
> + `--cc` or `-m` to include them.
> +endif::git-log[]
It probably is a better change to drop "Use `-c`..." and refer to
the "Diff formatting" section.
And then add '-p' and the fact that by default it will not show
pairwise diff for merge commits to the "Diff Formatting" section.
That is where -c/--cc/-m are already described.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html