diff options
| author | Denton Liu <liu.denton@gmail.com> | 2020-06-23 12:19:49 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-06-24 02:39:41 +0300 |
| commit | c592fd4c83021b4f098012b3307298fff923c6e7 (patch) | |
| tree | ba116caca3b023c89f4a1aef5f7701ac6a3d4304 | |
| parent | a9d7689cd405883849fc5bc5427812654d59394f (diff) | |
builtin/diff: fix botched update of usage comment
In the previous commit, an attempt was made to correct the "N=1, M=0"
case. However, the fix was botched and it introduced two half-correct
sections by mistake. Combine these half-correct sections into one fully
correct section.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/diff.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index bdae4d6a58..cdfb58d04b 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -284,11 +284,8 @@ int cmd_diff(int argc, const char **argv, const char *prefix) * N=1, M=0: * tree vs files (diff-index) * - * N=1, M=0: - * tree vs cache (diff-index --cached) - * * N=1, M=0, --cached: - * tree vs files (diff-index) + * tree vs cache (diff-index --cached) * * N=2, M=0: * tree vs tree (diff-tree) |