Re: [PATCH v2] doc: git-diff: rewrite EXAMPLES section

[Junio C Hamano <gitster@pobox.com>]

"Julia Evans via GitGitGadget" <gitgitgadget@gmail.com> writes:

>      +-git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]
>      ++git diff [<options>] --staged [--merge-base] [<commit>] [--] [<path>...]

This goes against what you said earlier, which was

> - Mention both `git diff --staged` and `git diff --cached`, because
>   "staged" is the term the Git user interface uses and several users
>   said they find it easier to understand. Add an entry for --staged
>   saying that it's a synonym. Like with `git switch`, and `git checkout`
>   it's useful to leave the older version for folks who are used to using
>   `git diff --cached` since we've seen that many people who are used to
>   using a command don't see any value in changing how they use it.

Perhaps (--cached|--staged) or have two lines (i.e., turn the range
diff into

>      + git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]
>      ++git diff [<options>] --staged [--merge-base] [<commit>] [--] [<path>...]

or something).

>      +@@ Documentation/git-diff.adoc: files on disk.
>      + 	do not give _<commit>_, it defaults to `HEAD`.
>      + 	If `HEAD` does not exist (e.g. unborn branches) and
>      + 	_<commit>_ is not given, it shows all staged changes.
>      +-	`--staged` is a synonym of `--cached`.
>      ++	`--cached` is a synonym of `--staged`.

And this is the other way around.

Other than that, the rest, including the resurrection of AUTO_MERGE,
looked OK.