diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-06-29 14:17:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-06-29 14:17:25 -0700 |
| commit | 1ea1f93fd9c6d299cbb94f74f0a1d80cb481a449 (patch) | |
| tree | ac8c10bd791aae2587bf595f2b4c1ddbd230263b | |
| parent | Merge branch 'xl/upgrade-repo-format' (diff) | |
| parent | builtin/diff: fix botched update of usage comment (diff) | |
| download | tgif-1ea1f93fd9c6d299cbb94f74f0a1d80cb481a449.tar.xz | |
Merge branch 'dl/diff-usage-comment-update'
An in-code comment in "git diff" has been updated.
* dl/diff-usage-comment-update:
builtin/diff: fix botched update of usage comment
builtin/diff: update usage comment
| -rw-r--r-- | builtin/diff.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index b3d17340ee..8c36da09b6 100644 --- a/builtin/diff.c +++ b/builtin/diff.c @@ -376,16 +376,25 @@ int cmd_diff(int argc, const char **argv, const char *prefix) /* * We could get N tree-ish in the rev.pending_objects list. - * Also there could be M blobs there, and P pathspecs. + * Also there could be M blobs there, and P pathspecs. --cached may + * also be present. * * N=0, M=0: - * cache vs files (diff-files) + * cache vs files (diff-files) + * + * N=0, M=0, --cached: + * HEAD vs cache (diff-index --cached) + * * N=0, M=2: * compare two random blobs. P must be zero. + * * N=0, M=1, P=1: - * compare a blob with a working tree file. + * compare a blob with a working tree file. * * N=1, M=0: + * tree vs files (diff-index) + * + * N=1, M=0, --cached: * tree vs cache (diff-index --cached) * * N=2, M=0: |