diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2022-02-11 16:56:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-11 16:56:01 -0800 |
| commit | acd920a0ee008993e1e2b1411148170d6476d20f (patch) | |
| tree | 85e39cb357f91c45d4ca58b2b4979689d3066124 /builtin/diff.c | |
| parent | Merge branch 'tg/fetch-prune-exit-code-fix' (diff) | |
| parent | builtin/diff.c: fix "git-diff" usage string typo (diff) | |
| download | tgif-acd920a0ee008993e1e2b1411148170d6476d20f.tar.xz | |
Merge branch 'sy/diff-usage-typofix'
Typofix.
* sy/diff-usage-typofix:
builtin/diff.c: fix "git-diff" usage string typo
Diffstat (limited to 'builtin/diff.c')
| -rw-r--r-- | builtin/diff.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index fa4683377e..bb7fafca61 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -28,9 +28,9 @@ static const char builtin_diff_usage[] = "git diff [<options>] [<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" +" or: git diff [<options>] <commit>...<commit> [--] [<path>...]\n" +" or: git diff [<options>] <blob> <blob>\n" +" or: git diff [<options>] --no-index [--] <path> <path>\n" COMMON_DIFF_OPTIONS_HELP; static const char *blob_path(struct object_array_entry *entry) |