{"thread":{"id":"35828","subject":"[PATCH] diff: Document --staged over --cached","startedAt":"2014-02-08T05:42:08Z","lastAt":"2014-02-08T05:42:08Z","messageCount":1,"participants":["Soren Brinkmann"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"234489","messageId":"1391838128-13382-1-git-send-email-soren.brinkmann@xilinx.com","threadId":"35828","inReplyTo":null,"subject":"[PATCH] diff: Document --staged over --cached","fromName":"Soren Brinkmann","fromEmail":"soren.brinkmann@xilinx.com","sentAt":"2014-02-08T05:42:08Z","receivedAt":"2014-02-08T05:42:08Z","isPatch":true,"sender":{"key":"soren.brinkmann@xilinx.com","avatar":null},"body":"Since recent documentation uses terms like 'staged' and 'staging area',\n--staged is more in line with other documentation and to be pfeferred\nover --cached.\n\nSigned-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>\n---\n Documentation/git-diff.txt | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt\nindex 33fbd8c56f91..12d5b62e71f9 100644\n--- a/Documentation/git-diff.txt\n+++ b/Documentation/git-diff.txt\n@@ -10,7 +10,7 @@ SYNOPSIS\n --------\n [verse]\n 'git diff' [options] [<commit>] [--] [<path>...]\n-'git diff' [options] --cached [<commit>] [--] [<path>...]\n+'git diff' [options] --staged [<commit>] [--] [<path>...]\n 'git diff' [options] <commit> <commit> [--] [<path>...]\n 'git diff' [options] <blob> <blob>\n 'git diff' [options] [--no-index] [--] <path> <path>\n@@ -38,7 +38,7 @@ two blob objects, or changes between two files on disk.\n \tor when running the command outside a working tree\n \tcontrolled by Git.\n \n-'git diff' [--options] --cached [<commit>] [--] [<path>...]::\n+'git diff' [--options] --staged [<commit>] [--] [<path>...]::\n \n \tThis form is to view the changes you staged for the next\n \tcommit relative to the named <commit>.  Typically you\n@@ -46,7 +46,7 @@ two blob objects, or changes between two files on disk.\n \tdo not give <commit>, it defaults to HEAD.\n \tIf HEAD does not exist (e.g. unborned branches) and\n \t<commit> is not given, it shows all staged changes.\n-\t--staged is a synonym of --cached.\n+\t--cached is a synonym of --staged.\n \n 'git diff' [--options] <commit> [--] [<path>...]::\n \n-- \n1.8.5.4\n"}]}