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

["Julia Evans" <julia@jvns.ca>]

>>>      + git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]
>>>      ++git diff [<options>] --staged [--merge-base] [<commit>] [--] [<path>...]
>>
>> or something).
>
> Clarification.
>
> The point is that there is a difference between giving wider
> exposure to "--staged" as an accepted synonym and swapping offical
> option with the synonym, let alone deprecating "--cached".

Sorry, that's embarrassing, I didn't mean to include this change.
I did an experimental rewrite to see what it would like to rename `--cached`
to `--staged`, decided it would be better to keep the scope small,
and I thought I'd undone it before submitting it.

Will take this out.

>>>      +@@ 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.

Good to hear.