Merge branch 'maint-1.6.0' into maint-1.6.1

diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index c53eba557d0a242a0d8553d9569ce8b2eb86331b..a2f192fb7519117f8e47f3ec4608e3301c200dc3 100644 (file)
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -33,6 +33,7 @@ forced by --no-index.
        commit relative to the named <commit>.  Typically you
        would want comparison with the latest commit, so if you
        do not give <commit>, it defaults to HEAD.
+       --staged is a synonym of --cached.
 
 'git diff' [--options] <commit> [--] [<path>...]::