undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/diff: fix botched update of usage comment

Browse Source 
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>
This commit is contained in:
Denton Liu 2020-06-23 05:19:49 -04:00 committed by Junio C Hamano
parent a9d7689cd4
commit c592fd4c83
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/diff.c
View File

@ -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)