summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-12-01 17:04:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-12-01 17:04:31 (GMT)
commitd4924ea7c3073c40b0f2cb367f21323aab9abfcd (patch)
tree1010bca05a27f5c3f9acb339f0994b7af1bc1068
parent5444d528662d7a64ec34486e63ffafced9005937 (diff)
parent0115e5d929d06ad41eff83742a3e6a1e91ecc0c4 (diff)
downloadgit-d4924ea7c3073c40b0f2cb367f21323aab9abfcd.zip
git-d4924ea7c3073c40b0f2cb367f21323aab9abfcd.tar.gz
git-d4924ea7c3073c40b0f2cb367f21323aab9abfcd.tar.bz2
Merge branch 'dl/doc-diff-no-index-implies-exit-code'
Doc update. * dl/doc-diff-no-index-implies-exit-code: git-diff.txt: document return code of `--no-index`
-rw-r--r--Documentation/git-diff.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 72179d9..37781cf 100644
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -36,7 +36,7 @@ two blob objects, or changes between two files on disk.
running the command in a working tree controlled by Git and
at least one of the paths points outside the working tree,
or when running the command outside a working tree
- controlled by Git.
+ controlled by Git. This form implies `--exit-code`.
'git diff' [<options>] --cached [<commit>] [--] [<path>...]::