Files
git/Documentation
Denton Liu eb448631fb git-diff: fix missing --merge-base docs
When `git diff --merge-base` was introduced at around Git 2.30, the
documentation included a few errors.

In the example given for `git diff --cached --merge-base`, the
`--cached` flag was omitted for the `--merge-base` example. Add the
missing flag.

In the `git diff <commit>` case, we failed to mention that
`--merge-base` is an available option. Give the usage of `--merge-base`
as an option there.

Finally, there are two errors in the usage of `git diff`. Firstly, we do
not mention `--merge-base` in the `git diff --cached` case. Mention it
so that it's consistent with the documentation. Secondly, we put the
`[--merge-base]` in between `<commit>` and `[<commit>...]`. Move the
`[--merge-base]` so that it's beside `[<options>]` which is a more
logical grouping.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2021-07-12 13:55:29 -07:00
..
2020-07-06 22:09:16 -07:00
2020-09-09 13:53:09 -07:00
2020-09-03 12:37:04 -07:00
2019-05-09 00:37:27 +09:00
2020-08-04 18:34:02 -07:00
2020-02-14 08:58:53 -08:00
2020-04-29 16:15:27 -07:00
2019-08-11 17:40:07 -07:00
2019-04-02 13:57:00 +09:00
2019-08-11 17:40:07 -07:00
2019-01-23 11:37:29 -08:00
2020-05-02 18:04:12 -07:00
2018-12-26 14:59:37 -08:00
2020-05-26 09:32:08 -07:00
2019-05-07 13:04:48 +09:00
2019-05-07 13:04:48 +09:00
2020-08-04 18:34:02 -07:00
2020-07-06 22:09:16 -07:00
2019-10-21 12:02:39 +09:00