summaryrefslogtreecommitdiff
path: root/builtin/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-07-28 20:17:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-07-28 20:17:59 (GMT)
commit6ca224f1560ec43973e0f1c76bc8ef487a6e107b (patch)
tree07039dff6971f561c32d0eb1ca77d1d90f7aaa2b /builtin/diff.c
parentdd6d3c90eeff56770f2f4b88fb61cc44bf01d890 (diff)
parenteb448631fb541239d91709d812b92bf2b57bc733 (diff)
downloadgit-6ca224f1560ec43973e0f1c76bc8ef487a6e107b.zip
git-6ca224f1560ec43973e0f1c76bc8ef487a6e107b.tar.gz
git-6ca224f1560ec43973e0f1c76bc8ef487a6e107b.tar.bz2
Merge branch 'dl/diff-merge-base'
"git diff --merge-base" documentation has been updated. * dl/diff-merge-base: git-diff: fix missing --merge-base docs
Diffstat (limited to 'builtin/diff.c')
-rw-r--r--builtin/diff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/diff.c b/builtin/diff.c
index 2d87c37..dd8ce68 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -26,8 +26,8 @@
static const char builtin_diff_usage[] =
"git diff [<options>] [<commit>] [--] [<path>...]\n"
-" or: git diff [<options>] --cached [<commit>] [--] [<path>...]\n"
-" or: git diff [<options>] <commit> [--merge-base] [<commit>...] <commit> [--] [<path>...]\n"
+" or: git diff [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]\n"
+" or: git diff [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]\n"
" or: git diff [<options>] <commit>...<commit>] [--] [<path>...]\n"
" or: git diff [<options>] <blob> <blob>]\n"
" or: git diff [<options>] --no-index [--] <path> <path>]\n"