summaryrefslogtreecommitdiff
path: root/Documentation/config/submodule.txt
diff options
context:
space:
mode:
authorLibravatar Denton Liu <liu.denton@gmail.com>2021-07-10 02:28:31 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-07-12 13:55:29 -0700
commiteb448631fb541239d91709d812b92bf2b57bc733 (patch)
tree85ba0ef1bf1d011fb361ad755fd642c87ecf2e0e /Documentation/config/submodule.txt
parentcontrib/completion: complete `git diff --merge-base` (diff)
downloadtgif-eb448631fb541239d91709d812b92bf2b57bc733.tar.xz
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>
Diffstat (limited to 'Documentation/config/submodule.txt')
0 files changed, 0 insertions, 0 deletions