{"thread":{"id":"32883","subject":"git-diff(1) appears to contradict itself","startedAt":"2013-02-12T02:49:35Z","lastAt":"2013-02-12T03:09:03Z","messageCount":3,"participants":["Reuben Thomas","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"209328","messageId":"CAOnWdojOT61XOY6JxL-3sR4W8N0katShsSLsOsuJ0-PuM9Vemg@mail.gmail.com","threadId":"32883","inReplyTo":null,"subject":"git-diff(1) appears to contradict itself","fromName":"Reuben Thomas","fromEmail":"rrt@sc3d.org","sentAt":"2013-02-12T02:49:35Z","receivedAt":"2013-02-12T02:49:35Z","isPatch":false,"sender":{"key":"rrt@sc3d.org","avatar":"https://gravatar.com/avatar/f1d2fd8cb53a9a1876636e095ed6c2e4f8ed357692bc1250cb91fdda23a2ac0a?d=mp&s=160"},"body":"Under the --color=<when> option, it says:\n\nShow colored diff. The value must be always (the default for <when>),\nnever, or auto. The default value is never.\n\nThat seems to imply that the default is both always and never. If I'm\nright, I suggest removing the parenthesis, and putting the correct\ndefault value at the end of the sentence. If I'm wrong, I suggest\nclarification!\n\n--\nhttp://rrt.sc3d.org\n"},{"id":"209329","messageId":"7v1ucmjl6x.fsf@alter.siamese.dyndns.org","threadId":"32883","inReplyTo":"CAOnWdojOT61XOY6JxL-3sR4W8N0katShsSLsOsuJ0-PuM9Vemg@mail.gmail.com","subject":"Re: git-diff(1) appears to contradict itself","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-02-12T02:54:46Z","receivedAt":"2013-02-12T02:54:46Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Reuben Thomas <rrt@sc3d.org> writes:\n\n> Under the --color=<when> option, it says:\n>\n> Show colored diff. The value must be always (the default for <when>),\n> never, or auto. The default value is never.\n\nI think it wants to say this:\n\n    You can say \"diff --color\" without saying \"when\".  That is the\n    same as saying \"diff --color=always\".\n\n    If you do not say \"--color\" at all, that is exactly the same as\n    saying \"diff --color=never\".\n\nPatches welcome.\n"},{"id":"209330","messageId":"CAOnWdohn-NhTqOzdNbqmUPkJz2+TyikPbnxnVD0rC7Rfnm-o5w@mail.gmail.com","threadId":"32883","inReplyTo":"7v1ucmjl6x.fsf@alter.siamese.dyndns.org","subject":"Re: git-diff(1) appears to contradict itself","fromName":"Reuben Thomas","fromEmail":"rrt@sc3d.org","sentAt":"2013-02-12T03:09:03Z","receivedAt":"2013-02-12T03:09:03Z","isPatch":false,"sender":{"key":"rrt@sc3d.org","avatar":"https://gravatar.com/avatar/f1d2fd8cb53a9a1876636e095ed6c2e4f8ed357692bc1250cb91fdda23a2ac0a?d=mp&s=160"},"body":"On 12 February 2013 02:54, Junio C Hamano <gitster@pobox.com> wrote:\n> Reuben Thomas <rrt@sc3d.org> writes:\n>\n>> Under the --color=<when> option, it says:\n>>\n>> Show colored diff. The value must be always (the default for <when>),\n>> never, or auto. The default value is never.\n>\n> I think it wants to say this:\n>\n>     You can say \"diff --color\" without saying \"when\".  That is the\n>     same as saying \"diff --color=always\".\n>\n>     If you do not say \"--color\" at all, that is exactly the same as\n>     saying \"diff --color=never\".\n>\n> Patches welcome.\n\nThanks for the explanation. Something like this, then:\n\ndiff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt\nindex 7a87473..9a02992 100644\n--- a/Documentation/diff-options.txt\n+++ b/Documentation/diff-options.txt\n@@ -174,9 +174,9 @@ any of those replacements occurred.\n     `diff.submodule` configuration variable.\n\n --color[=<when>]::\n-    Show colored diff.\n-    The value must be `always` (the default for `<when>`), `never`, or `auto`.\n-    The default value is `never`.\n+    Show colored diff (off by default).\n+    The value must be `always`, `never`, or `auto`.\n+    `--color` is the same as `--color=always`.\n ifdef::git-diff[]\n     It can be changed by the `color.ui` and `color.diff`\n     configuration settings.\n\n? I guess other commands that work the same, such as git-grep, could\ndo with a similar patch (indeed, I based my wording on that in the\ngit-grep page, but that has different problems.) Or you could use the\nsame fragment twice if that is possible in your system?\n\n--\nhttp://rrt.sc3d.org\n"}]}