{"thread":{"id":"33591","subject":"[PATCH 0/5] Documentation/git-diff.txt improvements","startedAt":"2013-04-24T16:33:31Z","lastAt":"2013-04-29T18:46:27Z","messageCount":39,"participants":["Ramkumar Ramachandra","Jonathan Nieder","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":5},"messages":[{"id":"215321","messageId":"1366821216-20868-1-git-send-email-artagnon@gmail.com","threadId":"33591","inReplyTo":null,"subject":"[PATCH 0/5] Documentation/git-diff.txt improvements","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-04-24T16:33:31Z","receivedAt":"2013-04-24T16:33:31Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Hi again,\n\nSo I decided that builtin/diff.c is hardcoded for the\n<commit>..<commit> and <commit>...<commit> forms, and we can do\nnothing about it unless we want to break compatibility (maybe a git\n2.0 candidate?).  The least we can do is document it properly in the\nSYNOPSIS.  I've done this in [4/5].\n\nThe other patches are just general \"while we're there\" cleanups.\n\nRamkumar Ramachandra (5):\n  git-diff.txt: reorder the <commit> <commit> form\n  git-diff.txt: strip the leading \"--\" from options template\n  git-diff.txt: group the [--] and [<path>...] templates\n  git-diff.txt: document the .. and ... forms in SYNOPSIS\n  git-diff.txt: fix ordering of the [--no-index] form\n\n Documentation/git-diff.txt | 42 ++++++++++++++++++++++--------------------\n 1 file changed, 22 insertions(+), 20 deletions(-)\n\n-- \n1.8.2.1.502.g2d60b5c\n"},{"id":"215322","messageId":"1366821216-20868-2-git-send-email-artagnon@gmail.com","threadId":"33591","inReplyTo":"1366821216-20868-1-git-send-email-artagnon@gmail.com","subject":"[PATCH 1/5] git-diff.txt: reorder the <commit> <commit> form","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-04-24T16:33:32Z","receivedAt":"2013-04-24T16:33:32Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"In DESCRIPTION, the '<commit>..<commit>' form refers to \"the previous\nform\", namely the '<commit> <commit>' form.  However, bd52900\n(Documentation: Describe \"git diff <blob> <blob>\" separately,\n2012-12-18) broke this by inserting a form in between these two forms.\nFix this by reordering a form.\n\nSigned-off-by: Ramkumar Ramachandra <artagnon@gmail.com>\n---\n Documentation/git-diff.txt | 12 ++++++------\n 1 file changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt\nindex a7b4620..8623867 100644\n--- a/Documentation/git-diff.txt\n+++ b/Documentation/git-diff.txt\n@@ -11,8 +11,8 @@ SYNOPSIS\n [verse]\n 'git diff' [options] [<commit>] [--] [<path>...]\n 'git diff' [options] --cached [<commit>] [--] [<path>...]\n-'git diff' [options] <commit> <commit> [--] [<path>...]\n 'git diff' [options] <blob> <blob>\n+'git diff' [options] <commit> <commit> [--] [<path>...]\n 'git diff' [options] [--no-index] [--] <path> <path>\n \n DESCRIPTION\n@@ -51,16 +51,16 @@ directories. This behavior can be forced by --no-index.\n \tbranch name to compare with the tip of a different\n \tbranch.\n \n-'git diff' [--options] <commit> <commit> [--] [<path>...]::\n-\n-\tThis is to view the changes between two arbitrary\n-\t<commit>.\n-\n 'git diff' [options] <blob> <blob>::\n \n \tThis form is to view the differences between the raw\n \tcontents of two blob objects.\n \n+'git diff' [--options] <commit> <commit> [--] [<path>...]::\n+\n+\tThis is to view the changes between two arbitrary\n+\t<commit>.\n+\n 'git diff' [--options] <commit>..<commit> [--] [<path>...]::\n \n \tThis is synonymous to the previous form.  If <commit> on\n-- \n1.8.2.1.502.g2d60b5c\n"},{"id":"215323","messageId":"1366821216-20868-3-git-send-email-artagnon@gmail.com","threadId":"33591","inReplyTo":"1366821216-20868-1-git-send-email-artagnon@gmail.com","subject":"[PATCH 2/5] git-diff.txt: strip the leading \"--\" from options template","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-04-24T16:33:33Z","receivedAt":"2013-04-24T16:33:33Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"It is imperative to specify options with the [options] template.\n[--options] is inconsistent as well as misleading (as there are short\noptions which can be specified with a single \"-\").  Fix this.\n\nSigned-off-by: Ramkumar Ramachandra <artagnon@gmail.com>\n---\n Documentation/git-diff.txt | 12 ++++++------\n 1 file changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt\nindex 8623867..47aa3fc 100644\n--- a/Documentation/git-diff.txt\n+++ b/Documentation/git-diff.txt\n@@ -21,7 +21,7 @@ Show changes between the working tree and the index or a tree, changes\n between the index and a tree, changes between two trees, or changes\n between two files on disk.\n \n-'git diff' [--options] [--] [<path>...]::\n+'git diff' [options] [--] [<path>...]::\n \n \tThis form is to view the changes you made relative to\n \tthe index (staging area for the next commit).  In other\n@@ -33,7 +33,7 @@ If exactly two paths are given and at least one points outside\n the current repository, 'git diff' will compare the two files /\n directories. This behavior can be forced by --no-index.\n \n-'git diff' [--options] --cached [<commit>] [--] [<path>...]::\n+'git diff' [options] --cached [<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@@ -43,7 +43,7 @@ directories. This behavior can be forced by --no-index.\n \t<commit> is not given, it shows all staged changes.\n \t--staged is a synonym of --cached.\n \n-'git diff' [--options] <commit> [--] [<path>...]::\n+'git diff' [options] <commit> [--] [<path>...]::\n \n \tThis form is to view the changes you have in your\n \tworking tree relative to the named <commit>.  You can\n@@ -56,18 +56,18 @@ directories. This behavior can be forced by --no-index.\n \tThis form is to view the differences between the raw\n \tcontents of two blob objects.\n \n-'git diff' [--options] <commit> <commit> [--] [<path>...]::\n+'git diff' [options] <commit> <commit> [--] [<path>...]::\n \n \tThis is to view the changes between two arbitrary\n \t<commit>.\n \n-'git diff' [--options] <commit>..<commit> [--] [<path>...]::\n+'git diff' [options] <commit>..<commit> [--] [<path>...]::\n \n \tThis is synonymous to the previous form.  If <commit> on\n \tone side is omitted, it will have the same effect as\n \tusing HEAD instead.\n \n-'git diff' [--options] <commit>\\...<commit> [--] [<path>...]::\n+'git diff' [options] <commit>\\...<commit> [--] [<path>...]::\n \n \tThis form is to view the changes on the branch containing\n \tand up to the second <commit>, starting at a common ancestor\n-- \n1.8.2.1.502.g2d60b5c\n"},{"id":"215324","messageId":"1366821216-20868-4-git-send-email-artagnon@gmail.com","threadId":"33591","inReplyTo":"1366821216-20868-1-git-send-email-artagnon@gmail.com","subject":"[PATCH 3/5] git-diff.txt: group the [--] and [<path>...] templates","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-04-24T16:33:34Z","receivedAt":"2013-04-24T16:33:34Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Clarify that \"--\" is meant to disambiguate paths from the other\noptions.\n\nSigned-off-by: Ramkumar Ramachandra <artagnon@gmail.com>\n---\n Documentation/git-diff.txt | 20 ++++++++++----------\n 1 file changed, 10 insertions(+), 10 deletions(-)\n\ndiff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt\nindex 47aa3fc..a0fdfc2 100644\n--- a/Documentation/git-diff.txt\n+++ b/Documentation/git-diff.txt\n@@ -9,11 +9,11 @@ git-diff - Show changes between commits, commit and working tree, etc\n SYNOPSIS\n --------\n [verse]\n-'git diff' [options] [<commit>] [--] [<path>...]\n-'git diff' [options] --cached [<commit>] [--] [<path>...]\n+'git diff' [options] [<commit>] [[--] [<path>...]]\n+'git diff' [options] --cached [<commit>] [[--] [<path>...]]\n 'git diff' [options] <blob> <blob>\n-'git diff' [options] <commit> <commit> [--] [<path>...]\n-'git diff' [options] [--no-index] [--] <path> <path>\n+'git diff' [options] <commit> <commit> [[--] [<path>...]]\n+'git diff' [options] [--no-index] [[--] <path> <path>]\n \n DESCRIPTION\n -----------\n@@ -21,7 +21,7 @@ Show changes between the working tree and the index or a tree, changes\n between the index and a tree, changes between two trees, or changes\n between two files on disk.\n \n-'git diff' [options] [--] [<path>...]::\n+'git diff' [options] [[--] [<path>...]]::\n \n \tThis form is to view the changes you made relative to\n \tthe index (staging area for the next commit).  In other\n@@ -33,7 +33,7 @@ If exactly two paths are given and at least one points outside\n the current repository, 'git diff' will compare the two files /\n directories. This behavior can be forced by --no-index.\n \n-'git diff' [options] --cached [<commit>] [--] [<path>...]::\n+'git diff' [options] --cached [<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@@ -43,7 +43,7 @@ directories. This behavior can be forced by --no-index.\n \t<commit> is not given, it shows all staged changes.\n \t--staged is a synonym of --cached.\n \n-'git diff' [options] <commit> [--] [<path>...]::\n+'git diff' [options] <commit> [[--] [<path>...]]::\n \n \tThis form is to view the changes you have in your\n \tworking tree relative to the named <commit>.  You can\n@@ -56,18 +56,18 @@ directories. This behavior can be forced by --no-index.\n \tThis form is to view the differences between the raw\n \tcontents of two blob objects.\n \n-'git diff' [options] <commit> <commit> [--] [<path>...]::\n+'git diff' [options] <commit> <commit> [[--] [<path>...]]::\n \n \tThis is to view the changes between two arbitrary\n \t<commit>.\n \n-'git diff' [options] <commit>..<commit> [--] [<path>...]::\n+'git diff' [options] <commit>..<commit> [[--] [<path>...]]::\n \n \tThis is synonymous to the previous form.  If <commit> on\n \tone side is omitted, it will have the same effect as\n \tusing HEAD instead.\n \n-'git diff' [options] <commit>\\...<commit> [--] [<path>...]::\n+'git diff' [options] <commit>\\...<commit> [[--] [<path>...]]::\n \n \tThis form is to view the changes on the branch containing\n \tand up to the second <commit>, starting at a common ancestor\n-- \n1.8.2.1.502.g2d60b5c\n"},{"id":"215326","messageId":"1366821216-20868-5-git-send-email-artagnon@gmail.com","threadId":"33591","inReplyTo":"1366821216-20868-1-git-send-email-artagnon@gmail.com","subject":"[PATCH 4/5] git-diff.txt: document the .. and ... forms in SYNOPSIS","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-04-24T16:33:35Z","receivedAt":"2013-04-24T16:33:35Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"The DESCRIPTION refers to the '<commit>..<commit>' and\n'<commit>...<commit>' forms, but the SYNOPSIS does not list them at\nall.  Fix this.\n\nSigned-off-by: Ramkumar Ramachandra <artagnon@gmail.com>\n---\n Documentation/git-diff.txt | 2 ++\n 1 file changed, 2 insertions(+)\n\ndiff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt\nindex a0fdfc2..291e250 100644\n--- a/Documentation/git-diff.txt\n+++ b/Documentation/git-diff.txt\n@@ -13,6 +13,8 @@ SYNOPSIS\n 'git diff' [options] --cached [<commit>] [[--] [<path>...]]\n 'git diff' [options] <blob> <blob>\n 'git diff' [options] <commit> <commit> [[--] [<path>...]]\n+'git diff' [options] <commit>..<commit> [[--] [<path>...]]\n+'git diff' [options] <commit>\\...<commit> [[--] [<path>...]]\n 'git diff' [options] [--no-index] [[--] <path> <path>]\n \n DESCRIPTION\n-- \n1.8.2.1.502.g2d60b5c\n"},{"id":"215325","messageId":"1366821216-20868-6-git-send-email-artagnon@gmail.com","threadId":"33591","inReplyTo":"1366821216-20868-1-git-send-email-artagnon@gmail.com","subject":"[PATCH 5/5] git-diff.txt: fix ordering of the [--no-index] form","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-04-24T16:33:36Z","receivedAt":"2013-04-24T16:33:36Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"The SYNOPSIS lists the [--no-index] form as the last item, but the\nDESCRIPTION lists it as a natural extension of the first form.  Fix\nthis with a reordering.  Also since the DESCRIPTION breaks up the\nfirst form in the SYNOPSIS into two different forms (one without the\noptional [<commit>], and the other with it), reorder to make these two\nforms appear together.\n\nSigned-off-by: Ramkumar Ramachandra <artagnon@gmail.com>\n---\n Documentation/git-diff.txt | 18 +++++++++---------\n 1 file changed, 9 insertions(+), 9 deletions(-)\n\ndiff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt\nindex 291e250..1f2f681 100644\n--- a/Documentation/git-diff.txt\n+++ b/Documentation/git-diff.txt\n@@ -10,12 +10,12 @@ SYNOPSIS\n --------\n [verse]\n 'git diff' [options] [<commit>] [[--] [<path>...]]\n+'git diff' [options] [--no-index] [[--] <path> <path>]\n 'git diff' [options] --cached [<commit>] [[--] [<path>...]]\n 'git diff' [options] <blob> <blob>\n 'git diff' [options] <commit> <commit> [[--] [<path>...]]\n 'git diff' [options] <commit>..<commit> [[--] [<path>...]]\n 'git diff' [options] <commit>\\...<commit> [[--] [<path>...]]\n-'git diff' [options] [--no-index] [[--] <path> <path>]\n \n DESCRIPTION\n -----------\n@@ -35,6 +35,14 @@ If exactly two paths are given and at least one points outside\n the current repository, 'git diff' will compare the two files /\n directories. This behavior can be forced by --no-index.\n \n+'git diff' [options] <commit> [[--] [<path>...]]::\n+\n+\tThis form is to view the changes you have in your\n+\tworking tree relative to the named <commit>.  You can\n+\tuse HEAD to compare it with the latest commit, or a\n+\tbranch name to compare with the tip of a different\n+\tbranch.\n+\n 'git diff' [options] --cached [<commit>] [[--] [<path>...]]::\n \n \tThis form is to view the changes you staged for the next\n@@ -45,14 +53,6 @@ directories. This behavior can be forced by --no-index.\n \t<commit> is not given, it shows all staged changes.\n \t--staged is a synonym of --cached.\n \n-'git diff' [options] <commit> [[--] [<path>...]]::\n-\n-\tThis form is to view the changes you have in your\n-\tworking tree relative to the named <commit>.  You can\n-\tuse HEAD to compare it with the latest commit, or a\n-\tbranch name to compare with the tip of a different\n-\tbranch.\n-\n 'git diff' [options] <blob> <blob>::\n \n \tThis form is to view the differences between the raw\n-- \n1.8.2.1.502.g2d60b5c\n"},{"id":"215328","messageId":"20130424164142.GC4119@elie.Belkin","threadId":"33591","inReplyTo":"1366821216-20868-2-git-send-email-artagnon@gmail.com","subject":"Re: [PATCH 1/5] git-diff.txt: reorder the <commit> <commit> form","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-04-24T16:41:42Z","receivedAt":"2013-04-24T16:41:42Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Ramkumar Ramachandra wrote:\n\n> In DESCRIPTION, the '<commit>..<commit>' form refers to \"the previous\n> form\", namely the '<commit> <commit>' form.  However, bd52900\n\nGood catch.\n\n[...]\n> --- a/Documentation/git-diff.txt\n> +++ b/Documentation/git-diff.txt\n> @@ -11,8 +11,8 @@ SYNOPSIS\n>  [verse]\n>  'git diff' [options] [<commit>] [--] [<path>...]\n>  'git diff' [options] --cached [<commit>] [--] [<path>...]\n> -'git diff' [options] <commit> <commit> [--] [<path>...]\n>  'git diff' [options] <blob> <blob>\n> +'git diff' [options] <commit> <commit> [--] [<path>...]\n>  'git diff' [options] [--no-index] [--] <path> <path>\n\nFor the sake of exposition I think it makes more sense to put\n<commit> <commit> *before* <blob> <blob>, since the former is used\nmore often.\n\nThanks,\nJonathan\n"},{"id":"215329","messageId":"20130424164300.GD4119@elie.Belkin","threadId":"33591","inReplyTo":"1366821216-20868-3-git-send-email-artagnon@gmail.com","subject":"Re: [PATCH 2/5] git-diff.txt: strip the leading \"--\" from options template","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-04-24T16:43:00Z","receivedAt":"2013-04-24T16:43:00Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Ramkumar Ramachandra wrote:\n\n> It is imperative to specify options with the [options] template.\n\nWhy is it imperative?\n\nAnyway, this looks like a good change.  With that sentence removed\nor some other clarification,\n\nReviewed-by: Jonathan Nieder <jrnieder@gmail.com>\n"},{"id":"215330","messageId":"CALkWK0=YNcavQAEiS8-huZ98hp+FTwtU7gqQ7yaoCWA61uWo_w@mail.gmail.com","threadId":"33591","inReplyTo":"20130424164300.GD4119@elie.Belkin","subject":"Re: [PATCH 2/5] git-diff.txt: strip the leading \"--\" from options template","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-04-24T16:44:08Z","receivedAt":"2013-04-24T16:44:08Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Jonathan Nieder wrote:\n> Why is it imperative?\n\nSorry about the thinko; s/imperative/idiomatic/\n"},{"id":"215333","messageId":"1366822980-21926-1-git-send-email-artagnon@gmail.com","threadId":"33591","inReplyTo":"1366821216-20868-1-git-send-email-artagnon@gmail.com","subject":"[PATCH 6/5] git-diff.txt: banish the <commit>..<commit> form","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-04-24T17:03:00Z","receivedAt":"2013-04-24T17:03:00Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"The '<commit>..<commit>' and '<commit>...<commit>' forms are confusing\nas they are reminiscent of the corresponding forms in the \"SPECIFYING\nRANGES\" section of revisions.txt.  We can remove the\n'<commit>..<commit>' form now (hence discouraging its use), since it\nis exactly equivalent to the clearer '<commit> <commit>' form.\nHowever, we must keep the '<commit>...<commit>' form around until we\ncan find a different way to express the same thing.\n\nSuggested-by: Junio C Hamano <gitster@pobox.com>\nSigned-off-by: Ramkumar Ramachandra <artagnon@gmail.com>\n---\n Documentation/git-diff.txt | 21 ++++++---------------\n 1 file changed, 6 insertions(+), 15 deletions(-)\n\ndiff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt\nindex 1f2f681..118b448 100644\n--- a/Documentation/git-diff.txt\n+++ b/Documentation/git-diff.txt\n@@ -14,7 +14,6 @@ SYNOPSIS\n 'git diff' [options] --cached [<commit>] [[--] [<path>...]]\n 'git diff' [options] <blob> <blob>\n 'git diff' [options] <commit> <commit> [[--] [<path>...]]\n-'git diff' [options] <commit>..<commit> [[--] [<path>...]]\n 'git diff' [options] <commit>\\...<commit> [[--] [<path>...]]\n \n DESCRIPTION\n@@ -63,12 +62,6 @@ directories. This behavior can be forced by --no-index.\n \tThis is to view the changes between two arbitrary\n \t<commit>.\n \n-'git diff' [options] <commit>..<commit> [[--] [<path>...]]::\n-\n-\tThis is synonymous to the previous form.  If <commit> on\n-\tone side is omitted, it will have the same effect as\n-\tusing HEAD instead.\n-\n 'git diff' [options] <commit>\\...<commit> [[--] [<path>...]]::\n \n \tThis form is to view the changes on the branch containing\n@@ -79,14 +72,12 @@ directories. This behavior can be forced by --no-index.\n \n Just in case if you are doing something exotic, it should be\n noted that all of the <commit> in the above description, except\n-in the last two forms that use \"..\" notations, can be any\n-<tree>.\n-\n-For a more complete list of ways to spell <commit>, see\n-\"SPECIFYING REVISIONS\" section in linkgit:gitrevisions[7].\n-However, \"diff\" is about comparing two _endpoints_, not ranges,\n-and the range notations (\"<commit>..<commit>\" and\n-\"<commit>\\...<commit>\") do not mean a range as defined in the\n+in the last \"...\" form, can be any <tree>.\n+\n+For a more complete list of ways to spell <commit>, see \"SPECIFYING\n+REVISIONS\" section in linkgit:gitrevisions[7].  However, \"diff\" is\n+about comparing two _endpoints_, not ranges, and the range notation\n+\"<commit>...<commit>\" does not mean a range as defined in the\n \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7].\n \n OPTIONS\n-- \n1.8.2.1.502.g2d60b5c\n"},{"id":"215345","messageId":"7vy5c7dcbr.fsf@alter.siamese.dyndns.org","threadId":"33591","inReplyTo":"CALkWK0=YNcavQAEiS8-huZ98hp+FTwtU7gqQ7yaoCWA61uWo_w@mail.gmail.com","subject":"Re: [PATCH 2/5] git-diff.txt: strip the leading \"--\" from options template","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-24T18:15:52Z","receivedAt":"2013-04-24T18:15:52Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ramkumar Ramachandra <artagnon@gmail.com> writes:\n\n> Jonathan Nieder wrote:\n>> Why is it imperative?\n>\n> Sorry about the thinko; s/imperative/idiomatic/\n\nYeah, I think this step looks reasonable.\n"},{"id":"215346","messageId":"7vtxmvdc4d.fsf@alter.siamese.dyndns.org","threadId":"33591","inReplyTo":"1366821216-20868-4-git-send-email-artagnon@gmail.com","subject":"Re: [PATCH 3/5] git-diff.txt: group the [--] and [<path>...] templates","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-24T18:20:18Z","receivedAt":"2013-04-24T18:20:18Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ramkumar Ramachandra <artagnon@gmail.com> writes:\n\n> -'git diff' [options] [--] [<path>...]::\n> +'git diff' [options] [[--] [<path>...]]::\n\nYou can say\n\n    \"git diff A B --\" without any path\n    \"git diff A B pathspec\" without any double-dashes\n    \"git diff -- pathspec\"\n\nand all three of them are expressed by versions before or after the\npatch, so there is no change in the semantics introduced by this\npatch.\n\nWhile the update might be logically more correct, it looks to me\nthat the only end-user visibile effect of it is to make the end\nresult harder to read.\n"},{"id":"215347","messageId":"CALkWK0nU-iTSF2DnmJAB=kj6w+VFv3rQrixEnHz0vyXf2d2=Mw@mail.gmail.com","threadId":"33591","inReplyTo":"7vtxmvdc4d.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 3/5] git-diff.txt: group the [--] and [<path>...] templates","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-04-24T18:23:04Z","receivedAt":"2013-04-24T18:23:04Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Junio C Hamano wrote:\n> While the update might be logically more correct, it looks to me\n> that the only end-user visibile effect of it is to make the end\n> result harder to read.\n\nHm, I thought it improves readability.  I'm trying to say that -- is\nused to separate [<path>...] from [everything else].\n"},{"id":"215348","messageId":"7vmwsndbve.fsf@alter.siamese.dyndns.org","threadId":"33591","inReplyTo":"1366821216-20868-6-git-send-email-artagnon@gmail.com","subject":"Re: [PATCH 5/5] git-diff.txt: fix ordering of the [--no-index] form","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-24T18:25:41Z","receivedAt":"2013-04-24T18:25:41Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ramkumar Ramachandra <artagnon@gmail.com> writes:\n\n> The SYNOPSIS lists the [--no-index] form as the last item, but the\n> DESCRIPTION lists it as a natural extension of the first form.\n\nPerhaps either the description or your reading is wrong.\n\nThe \"--no-index\" mode was a hack to allow \"git diff\" goodies to be\nused outside the context of \"git\", and a proper execution of it\nshould have been to send patches to GNU or BSD diff maintainers, not\nto add the \"--no-index\" option that is unrelated to \"git\" to our\ncode.\n\nI think it is more correct to list it as a footnote and list\nseparately from the main text, which is what the original SYNOPSIS\nsection does.\n"},{"id":"215349","messageId":"7vip3bdbpg.fsf@alter.siamese.dyndns.org","threadId":"33591","inReplyTo":"1366822980-21926-1-git-send-email-artagnon@gmail.com","subject":"Re: [PATCH 6/5] git-diff.txt: banish the <commit>..<commit> form","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-24T18:29:15Z","receivedAt":"2013-04-24T18:29:15Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ramkumar Ramachandra <artagnon@gmail.com> writes:\n\n> The '<commit>..<commit>' and '<commit>...<commit>' forms are confusing\n> as they are reminiscent of the corresponding forms in the \"SPECIFYING\n> RANGES\" section of revisions.txt.  We can remove the\n> '<commit>..<commit>' form now (hence discouraging its use), since it\n> is exactly equivalent to the clearer '<commit> <commit>' form.\n> However, we must keep the '<commit>...<commit>' form around until we\n> can find a different way to express the same thing.\n>\n> Suggested-by: Junio C Hamano <gitster@pobox.com>\n> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>\n> ---\n>  Documentation/git-diff.txt | 21 ++++++---------------\n>  1 file changed, 6 insertions(+), 15 deletions(-)\n>\n> diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt\n> index 1f2f681..118b448 100644\n> --- a/Documentation/git-diff.txt\n> +++ b/Documentation/git-diff.txt\n> @@ -14,7 +14,6 @@ SYNOPSIS\n>  'git diff' [options] --cached [<commit>] [[--] [<path>...]]\n>  'git diff' [options] <blob> <blob>\n>  'git diff' [options] <commit> <commit> [[--] [<path>...]]\n> -'git diff' [options] <commit>..<commit> [[--] [<path>...]]\n\nI agree with the end result not to list .. form in the SYNOPSIS, but\nyou shouldn't have added it in the first place in the earlier patch.\n\n>  'git diff' [options] <commit>\\...<commit> [[--] [<path>...]]\n>  \n>  DESCRIPTION\n> @@ -63,12 +62,6 @@ directories. This behavior can be forced by --no-index.\n>  \tThis is to view the changes between two arbitrary\n>  \t<commit>.\n>  \n> -'git diff' [options] <commit>..<commit> [[--] [<path>...]]::\n> -\n> -\tThis is synonymous to the previous form.  If <commit> on\n> -\tone side is omitted, it will have the same effect as\n> -\tusing HEAD instead.\n\nI do not think it is a bad idea to drop this enumerated item, but I\nwould have expected a sidenote to be added for the description for\n\"git diff A B\" form, so that people who saw \"git diff A..B\" somewhere\non the web and wonder what it means can look it up.\n"},{"id":"215350","messageId":"CALkWK0kaFc8cj-=1NbEwC_61U7qUCye70d9MZR66TpKB3i9XyA@mail.gmail.com","threadId":"33591","inReplyTo":"7vmwsndbve.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 5/5] git-diff.txt: fix ordering of the [--no-index] form","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-04-24T18:29:54Z","receivedAt":"2013-04-24T18:29:54Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Junio C Hamano wrote:\n> The \"--no-index\" mode was a hack to allow \"git diff\" goodies to be\n> used outside the context of \"git\", and a proper execution of it\n> should have been to send patches to GNU or BSD diff maintainers, not\n> to add the \"--no-index\" option that is unrelated to \"git\" to our\n> code.\n\nYeah, I know.  I use it instead of diff all the time.\n\n> I think it is more correct to list it as a footnote and list\n> separately from the main text, which is what the original SYNOPSIS\n> section does.\n\nI was trying to be more \"correct\" here.  The form is a special case of\nthe first form where the number of paths are limited to two.  Besides,\nisn't that how the DESCRIPTION section explains it now?\n"},{"id":"215351","messageId":"CALkWK0n7GwWy6FenZiJYyqetY3LQH=CM_eB0wag5n8uN9er5DQ@mail.gmail.com","threadId":"33591","inReplyTo":"7vip3bdbpg.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 6/5] git-diff.txt: banish the <commit>..<commit> form","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-04-24T18:33:54Z","receivedAt":"2013-04-24T18:33:54Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"On Wed, Apr 24, 2013 at 11:59 PM, Junio C Hamano <gitster@pobox.com> wrote:\n> I agree with the end result not to list .. form in the SYNOPSIS, but\n> you shouldn't have added it in the first place in the earlier patch.\n\nI'm expecting to re-roll anyway.  I just wanted to show it to you now.\n\n> I do not think it is a bad idea to drop this enumerated item, but I\n> would have expected a sidenote to be added for the description for\n> \"git diff A B\" form, so that people who saw \"git diff A..B\" somewhere\n> on the web and wonder what it means can look it up.\n\nYeah, good idea.  I'll put it in the section after the ... syntax.\n"},{"id":"215352","messageId":"7vbo93db25.fsf@alter.siamese.dyndns.org","threadId":"33591","inReplyTo":"CALkWK0nU-iTSF2DnmJAB=kj6w+VFv3rQrixEnHz0vyXf2d2=Mw@mail.gmail.com","subject":"Re: [PATCH 3/5] git-diff.txt: group the [--] and [<path>...] templates","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-24T18:43:14Z","receivedAt":"2013-04-24T18:43:14Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ramkumar Ramachandra <artagnon@gmail.com> writes:\n\n> Junio C Hamano wrote:\n>>> -'git diff' [options] [--] [<path>...]::\n>>> +'git diff' [options] [[--] [<path>...]]::\n>>\n>> While the update might be logically more correct, it looks to me\n>> that the only end-user visibile effect of it is to make the end\n>> result harder to read.\n>\n> Hm, I thought it improves readability.  I'm trying to say that -- is\n> used to separate [<path>...] from [everything else].\n\nThe same logic would apply to this semi-nonsense rewrite, no?\n\n\tgit diff [[options] [--]] [<path>...]\n\nEverything else comes before \"--\" (if exists) that separates it from\nthe list of pathspecs.\n"},{"id":"215354","messageId":"CALkWK0nN+9XOTCqiY+yB9moQSvFFpSO=OZjJtLphBd2eQ24uDw@mail.gmail.com","threadId":"33591","inReplyTo":"7vbo93db25.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 3/5] git-diff.txt: group the [--] and [<path>...] templates","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-04-24T18:53:38Z","receivedAt":"2013-04-24T18:53:38Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Junio C Hamano wrote:\n> The same logic would apply to this semi-nonsense rewrite, no?\n>\n>         git diff [[options] [--]] [<path>...]\n>\n> Everything else comes before \"--\" (if exists) that separates it from\n> the list of pathspecs.\n\nYeah, except it's sometimes\n\n    [[options] [revision range] [--]] [<path>...]\n\nand other times\n\n    [[options] [<commit>...] [--]] [<path>...]\n\nand yet other times\n\n    [[options] [--]] [<path>...]\n\nWhereas mine is always\n\n    ... [[--] [<path>]]\n\n(everywhere in git)\n"},{"id":"215356","messageId":"20130424185720.GC29963@google.com","threadId":"33591","inReplyTo":"CALkWK0nU-iTSF2DnmJAB=kj6w+VFv3rQrixEnHz0vyXf2d2=Mw@mail.gmail.com","subject":"Re: [PATCH 3/5] git-diff.txt: group the [--] and [<path>...] templates","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-04-24T18:57:32Z","receivedAt":"2013-04-24T18:57:32Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Ramkumar Ramachandra wrote:\n\n> Hm, I thought it improves readability.  I'm trying to say that -- is\n> used to separate [<path>...] from [everything else].\n\nI agree with the goal, but I don't think this change achieves it.\nMaybe adding gitcli(7) to the SEE ALSO section would work?\n\nJonathan\n"},{"id":"215358","messageId":"20130424190317.GD29963@google.com","threadId":"33591","inReplyTo":"1366821216-20868-5-git-send-email-artagnon@gmail.com","subject":"Re: [PATCH 4/5] git-diff.txt: document the .. and ... forms in SYNOPSIS","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-04-24T19:03:17Z","receivedAt":"2013-04-24T19:03:17Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Ramkumar Ramachandra wrote:\n\n> --- a/Documentation/git-diff.txt\n> +++ b/Documentation/git-diff.txt\n> @@ -13,6 +13,8 @@ SYNOPSIS\n>  'git diff' [options] --cached [<commit>] [[--] [<path>...]]\n>  'git diff' [options] <blob> <blob>\n>  'git diff' [options] <commit> <commit> [[--] [<path>...]]\n> +'git diff' [options] <commit>..<commit> [[--] [<path>...]]\n> +'git diff' [options] <commit>\\...<commit> [[--] [<path>...]]\n>  'git diff' [options] [--no-index] [[--] <path> <path>]\n\nThis is preparation for removing <commit>..<commit> from the\ndocumentation, right?  It makes sense to add the ...  form since\nthere's no other way to spell it but I can't say I'm excited about\nadding the .. form.  Especially since <tree>..<tree> doesn't work,\nthat form's a little embarrassing. ;-)\n\n*checks the manpage*\n\nAh, this is to make the SYNOPSIS a better table of contents for the\nDESCRIPTION (except that the DESCRIPTION treats \"git diff --no-index\n<path> <path>\" before \"git diff [<commit>] -- <pathspec>\" while the\nSYNOPSIS doesn't).  Maybe it would make sense to go all the way and\nmake the two follow the same order?\n\nMy 2¢,\nJonathan\n"},{"id":"215359","messageId":"20130424190638.GE29963@google.com","threadId":"33591","inReplyTo":"CALkWK0kaFc8cj-=1NbEwC_61U7qUCye70d9MZR66TpKB3i9XyA@mail.gmail.com","subject":"Re: [PATCH 5/5] git-diff.txt: fix ordering of the [--no-index] form","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-04-24T19:06:38Z","receivedAt":"2013-04-24T19:06:38Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Ramkumar Ramachandra wrote:\n\n>                                          The form is a special case of\n> the first form where the number of paths are limited to two.  Besides,\n> isn't that how the DESCRIPTION section explains it now?\n\nSort of.  It's a completely different form, but when --no-index is\nleft out the syntax is a special case of \"git diff -- <path>...\".\n\nMaybe it would make sense to move towards eliminating the \"implicit\n--no-index for paths outside the repository\" trick.  I use \"git diff\n--no-index\" all the time, but I always spell it out to be careful.\n"},{"id":"215360","messageId":"CALkWK0n2zFp1t7qtKp8-Ohoz0QEn4BQrfvxzqt+qwLS5+sNdHQ@mail.gmail.com","threadId":"33591","inReplyTo":"20130424190638.GE29963@google.com","subject":"Re: [PATCH 5/5] git-diff.txt: fix ordering of the [--no-index] form","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-04-24T19:10:37Z","receivedAt":"2013-04-24T19:10:37Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Jonathan Nieder wrote:\n> Maybe it would make sense to move towards eliminating the \"implicit\n> --no-index for paths outside the repository\" trick.  I use \"git diff\n> --no-index\" all the time, but I always spell it out to be careful.\n\nHuh?  Why do you want to endure the pain of spelling it out, when your\nintent is perfectly clear?\n\nWhat would make sense is a tristate diff.no-index:\ninside-worktree|outside-worktree|always.  I don't know why we should\neven have a \"never\".\n"},{"id":"215362","messageId":"20130424191453.GG29963@google.com","threadId":"33591","inReplyTo":"CALkWK0n2zFp1t7qtKp8-Ohoz0QEn4BQrfvxzqt+qwLS5+sNdHQ@mail.gmail.com","subject":"Re: [PATCH 5/5] git-diff.txt: fix ordering of the [--no-index] form","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-04-24T19:14:53Z","receivedAt":"2013-04-24T19:14:53Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Ramkumar Ramachandra wrote:\n> Jonathan Nieder wrote:\n\n>> Maybe it would make sense to move towards eliminating the \"implicit\n>> --no-index for paths outside the repository\" trick.  I use \"git diff\n>> --no-index\" all the time, but I always spell it out to be careful.\n>\n> Huh?  Why do you want to endure the pain of spelling it out, when your\n> intent is perfectly clear?\n\nBecause typing paths does not make my intent perfectly clear.\n\n> What would make sense is a tristate diff.no-index:\n\nOh please no.\n\nHope that helps,\nJonathan\n"},{"id":"215363","messageId":"CALkWK0mK=myPEsFrhVd2Xi3U10L+jZ+_WV=1JvxyvpnO3yUJGg@mail.gmail.com","threadId":"33591","inReplyTo":"20130424191453.GG29963@google.com","subject":"Re: [PATCH 5/5] git-diff.txt: fix ordering of the [--no-index] form","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-04-24T19:20:21Z","receivedAt":"2013-04-24T19:20:21Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Jonathan Nieder wrote:\n> Oh please no.\n\nIf I understand this correctly, you are horrified by this?\nhttps://github.com/artagnon/dotfiles/blob/master/.gitconfig#L30\n\nBy the way, my zsh aliases git to g.\n"},{"id":"215364","messageId":"7vy5c7buqn.fsf@alter.siamese.dyndns.org","threadId":"33591","inReplyTo":"CALkWK0nN+9XOTCqiY+yB9moQSvFFpSO=OZjJtLphBd2eQ24uDw@mail.gmail.com","subject":"Re: [PATCH 3/5] git-diff.txt: group the [--] and [<path>...] templates","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-24T19:21:04Z","receivedAt":"2013-04-24T19:21:04Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ramkumar Ramachandra <artagnon@gmail.com> writes:\n\n> Junio C Hamano wrote:\n>> The same logic would apply to this semi-nonsense rewrite, no?\n>>\n>>         git diff [[options] [--]] [<path>...]\n>>\n>> Everything else comes before \"--\" (if exists) that separates it from\n>> the list of pathspecs.\n>\n> Yeah, except it's sometimes\n>\n>     [[options] [revision range] [--]] [<path>...]\n>\n> and other times\n>\n>     [[options] [<commit>...] [--]] [<path>...]\n>\n> and yet other times\n>\n>     [[options] [--]] [<path>...]\n>\n> Whereas mine is always\n>\n>     ... [[--] [<path>]]\n>\n> (everywhere in git)\n\nYou are missing the entire point.  Neither [[everything else][--]][path]\nor [everything else][[--][path]] is better than without the extra\nlevel of [], which does not help clarifying _anything_.\n"},{"id":"215367","messageId":"CALkWK0kUmtXhEf90cs4yEj8_9FvxhDGZKS2crE6f-bpwrJ0fYg@mail.gmail.com","threadId":"33591","inReplyTo":"7vy5c7buqn.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 3/5] git-diff.txt: group the [--] and [<path>...] templates","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-04-24T19:24:01Z","receivedAt":"2013-04-24T19:24:01Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Junio C Hamano wrote:\n> You are missing the entire point.\n\nYeah, okay: I'll drop this patch.  I was just saying; I don't feel\nstrongly about it at all.\n"},{"id":"215368","messageId":"20130424192549.GI29963@google.com","threadId":"33591","inReplyTo":"CALkWK0mK=myPEsFrhVd2Xi3U10L+jZ+_WV=1JvxyvpnO3yUJGg@mail.gmail.com","subject":"Re: [PATCH 5/5] git-diff.txt: fix ordering of the [--no-index] form","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-04-24T19:25:49Z","receivedAt":"2013-04-24T19:25:49Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Ramkumar Ramachandra wrote:\n> Jonathan Nieder wrote:\n\n>> Oh please no.\n>\n> If I understand this correctly, you are horrified by this?\n> https://github.com/artagnon/dotfiles/blob/master/.gitconfig#L30\n\nNope, that looks like a useful way to save typing, and \"git help\"\nhelpfully expands any of your custom commands when you want to\ntranslate in order to help other people.\n"},{"id":"215370","messageId":"CALkWK0=KWu3=j5sLK3hr=Gx5xLnLaPAY+E=J0_izRCj9YcBTEg@mail.gmail.com","threadId":"33591","inReplyTo":"20130424191453.GG29963@google.com","subject":"Re: [PATCH 5/5] git-diff.txt: fix ordering of the [--no-index] form","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-04-24T19:37:11Z","receivedAt":"2013-04-24T19:37:11Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Jonathan Nieder wrote:\n> Because typing paths does not make my intent perfectly clear.\n\nI'm not able to understand this.  Doesn't your prompt tell you which\ndirectory you're in, and if you're in a git repository?  When you type\nout paths, you know what is inside and what is outside your\nrepository.  By extension, you know when --no-index is implied and\nwhen it isn't.\n\nCan you explain what your problem is?\n"},{"id":"215377","messageId":"20130424203732.GJ29963@google.com","threadId":"33591","inReplyTo":"CALkWK0=KWu3=j5sLK3hr=Gx5xLnLaPAY+E=J0_izRCj9YcBTEg@mail.gmail.com","subject":"Re: [PATCH 5/5] git-diff.txt: fix ordering of the [--no-index] form","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-04-24T20:37:32Z","receivedAt":"2013-04-24T20:37:32Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Ramkumar Ramachandra wrote:\n> Jonathan Nieder wrote:\n\n>> Because typing paths does not make my intent perfectly clear.\n>\n> I'm not able to understand this.  Doesn't your prompt tell you which\n> directory you're in, and if you're in a git repository?  When you type\n> out paths, you know what is inside and what is outside your\n> repository.  By extension, you know when --no-index is implied and\n> when it isn't.\n>\n> Can you explain what your problem is?\n\nAre you wondering why I use --no-index or why I think we should\neventually stop moving into --no-index mode by default?\n\nThe answers are different.  I use --no-index because it means I don't\nhave to think about whether the files I am comparing are in a Git\nrepository.  It's relaxing.  I'm not advocating that you follow suit;\nI'm just describing my own usage of the command.\n\nI think git should eventually stop doing --no-index implicitly because\nit is a very different mode using the same syntax triggered by\nexternal conditions.  That is\n\n * hard to document\n * problematic for scripts calling \"git diff\", can create lurking bugs\n * unnecessarily complicated.  For example:\n   * \"git diff -h\" output depends on whether I am in a git worktree.\n   * git searches for a .git directory, possibly hitting filesystem\n     automount points, just to decide whether its arguments are inside\n     the current repository.\n"},{"id":"215379","messageId":"CALkWK0=-Bu-x=zg2f-uY7qUkwCp_8AdDAVv6=k0oyV4xYvBuWQ@mail.gmail.com","threadId":"33591","inReplyTo":"20130424203732.GJ29963@google.com","subject":"Re: [PATCH 5/5] git-diff.txt: fix ordering of the [--no-index] form","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-04-24T20:45:57Z","receivedAt":"2013-04-24T20:45:57Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Jonathan Nieder wrote:\n>  * hard to document\n> [...]\n\nI completely disagree, but we don't have to agree: make it a\nconfiguration variable.  Even if it's turned to \"never\" by default, I\ndon't mind having one extra line in my .gitconfig.  But you went all\n\"Oh please no\" when I brought it up.  I thought you were claiming that\nnobody finds it useful.  Now, you seem to be claiming that people who\nfind it useful must suffer.\n"},{"id":"215381","messageId":"20130424205046.GK29963@google.com","threadId":"33591","inReplyTo":"CALkWK0=-Bu-x=zg2f-uY7qUkwCp_8AdDAVv6=k0oyV4xYvBuWQ@mail.gmail.com","subject":"Re: [PATCH 5/5] git-diff.txt: fix ordering of the [--no-index] form","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-04-24T20:50:46Z","receivedAt":"2013-04-24T20:50:46Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Ramkumar Ramachandra wrote:\n\n> I completely disagree, but we don't have to agree: make it a\n> configuration variable.\n\nI thought we had discussed before how every configuration variable\ncosts quite a lot in terms of Git's teachability.\n\nWhat would that configuration variable even mean?  \"Set this to make\nother people's scripts work when they assume --no-index won't be\ntriggered automatically\"?\n"},{"id":"215383","messageId":"CALkWK0nhtoY+FWWybqLvtOHmDMSFLbM_4sozqeYf7tS5yY_XdQ@mail.gmail.com","threadId":"33591","inReplyTo":"20130424205046.GK29963@google.com","subject":"Re: [PATCH 5/5] git-diff.txt: fix ordering of the [--no-index] form","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-04-24T20:55:35Z","receivedAt":"2013-04-24T20:55:35Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Jonathan Nieder wrote:\n> What would that configuration variable even mean?  \"Set this to make\n> other people's scripts work when they assume --no-index won't be\n> triggered automatically\"?\n\nNo.  \"Set this for interactive use\".\n"},{"id":"215438","messageId":"CALkWK0nVZHwSMS_gtisiAguNhAMnDpdWmAtz_OgzP93YZtYfHQ@mail.gmail.com","threadId":"33591","inReplyTo":"1366821216-20868-1-git-send-email-artagnon@gmail.com","subject":"Re: [PATCH 0/5] Documentation/git-diff.txt improvements","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-04-25T11:25:10Z","receivedAt":"2013-04-25T11:25:10Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"So, I decided to drop everything and just submit the first two parts.\nUntil we can decide what to do about the '<commit>..<commit>' and\n'<commit>...<commit>' forms (new rev spec? overload existing rev spec\nto change the meaning? deprecate without a viable alternative?), let's\nleave them as it is.\n\nNothing to resubmit.  Junio: can you just queue the first two parts?\n\nThanks.\n\nRamkumar Ramachandra (2):\n  git-diff.txt: reorder the <commit> <commit> form\n  git-diff.txt: strip the leading \"--\" from options template\n\n Documentation/git-diff.txt | 22 +++++++++++-----------\n 1 file changed, 11 insertions(+), 11 deletions(-)\n"},{"id":"215865","messageId":"7v38u9l2jk.fsf@alter.siamese.dyndns.org","threadId":"33591","inReplyTo":"CALkWK0nVZHwSMS_gtisiAguNhAMnDpdWmAtz_OgzP93YZtYfHQ@mail.gmail.com","subject":"Re: [PATCH 0/5] Documentation/git-diff.txt improvements","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-29T16:33:35Z","receivedAt":"2013-04-29T16:33:35Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ramkumar Ramachandra <artagnon@gmail.com> writes:\n\n> So, I decided to drop everything and just submit the first two parts.\n> Until we can decide what to do about the '<commit>..<commit>' and\n> '<commit>...<commit>' forms (new rev spec? overload existing rev spec\n> to change the meaning? deprecate without a viable alternative?), let's\n> leave them as it is.\n\nI had an impression that many of them, with the suggested fix-ups,\nwere improvements, with or without the A~B discussion.  It seems\nthat the entire review wasted many braincycles if you are to drop\nthe ball at this point, which is very dissapointing.\n\n> Nothing to resubmit.  Junio: can you just queue the first two parts?\n\nI do not appreciate \"Nothing to resubmit\".  [1/5] needs fixes to the\nissue Jonathan pointed out, doesn't it?\n"},{"id":"215872","messageId":"CALkWK0=aF2H4b9L32zvFQweYrzsJ-ZoBZ59TcECEasyy5TyvmQ@mail.gmail.com","threadId":"33591","inReplyTo":"7v38u9l2jk.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 0/5] Documentation/git-diff.txt improvements","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-04-29T17:19:44Z","receivedAt":"2013-04-29T17:19:44Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Junio C Hamano wrote:\n> I had an impression that many of them, with the suggested fix-ups,\n> were improvements, with or without the A~B discussion.  It seems\n> that the entire review wasted many braincycles if you are to drop\n> the ball at this point, which is very dissapointing.\n\nNo, I don't meant to drop the ball at all.  I'm _very_ annoyed by this\ninconsistency, and have a burning desire to fix it.  It's just that I\ndon't want to fixup something now and regret it later, so I'm putting\nit off until the A~B issue gets resolved.  In the meantime, the first\ntwo patches are fine and can be applied as is.\n\n> I do not appreciate \"Nothing to resubmit\".  [1/5] needs fixes to the\n> issue Jonathan pointed out, doesn't it?\n\nOh, I thought it was fairly trivial and that you'd fix it up locally.\nWould you like me to resend with the fixup?\n"},{"id":"215877","messageId":"7va9ohjkv7.fsf@alter.siamese.dyndns.org","threadId":"33591","inReplyTo":"CALkWK0=aF2H4b9L32zvFQweYrzsJ-ZoBZ59TcECEasyy5TyvmQ@mail.gmail.com","subject":"Re: [PATCH 0/5] Documentation/git-diff.txt improvements","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-29T17:40:44Z","receivedAt":"2013-04-29T17:40:44Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ramkumar Ramachandra <artagnon@gmail.com> writes:\n\n> Junio C Hamano wrote:\n>> I had an impression that many of them, with the suggested fix-ups,\n>> were improvements, with or without the A~B discussion.  It seems\n>> that the entire review wasted many braincycles if you are to drop\n>> the ball at this point, which is very dissapointing.\n>\n> No, I don't meant to drop the ball at all.  I'm _very_ annoyed by this\n> inconsistency, and have a burning desire to fix it.  It's just that I\n> don't want to fixup something now and regret it later, so I'm putting\n> it off until the A~B issue gets resolved.  In the meantime, the first\n> two patches are fine and can be applied as is.\n\nAs far as I am concerned, there is no A~B issue.\n\nPlease don't let it take good changes hostage.\n"},{"id":"215897","messageId":"CALkWK0n2V3LE6Vt2YQd5AKFkv5h0os=7MZA2GqwcrPQ1vEvE+Q@mail.gmail.com","threadId":"33591","inReplyTo":"7va9ohjkv7.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 0/5] Documentation/git-diff.txt improvements","fromName":"Ramkumar Ramachandra","fromEmail":"artagnon@gmail.com","sentAt":"2013-04-29T18:28:41Z","receivedAt":"2013-04-29T18:28:41Z","isPatch":true,"sender":{"key":"r@artagnon.com","avatar":"https://avatars.githubusercontent.com/u/37226?v=4"},"body":"Junio C Hamano wrote:\n> As far as I am concerned, there is no A~B issue.\n\nYou don't have to remind me about how hostile you are towards new\nproposals.  I already know.\n\n> Please don't let it take good changes hostage.\n\nThose are my changes, and I will not check them in until I'm happy\nwith them.  How did this turn into a hostage situation?  I've already\nsigned off on my changes: you or anyone else has every right to pick\nthem up and merge them (even if I don't like them).\n"},{"id":"215900","messageId":"7vip35i398.fsf@alter.siamese.dyndns.org","threadId":"33591","inReplyTo":"CALkWK0n2V3LE6Vt2YQd5AKFkv5h0os=7MZA2GqwcrPQ1vEvE+Q@mail.gmail.com","subject":"Re: [PATCH 0/5] Documentation/git-diff.txt improvements","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-29T18:46:27Z","receivedAt":"2013-04-29T18:46:27Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ramkumar Ramachandra <artagnon@gmail.com> writes:\n\n> Junio C Hamano wrote:\n>> As far as I am concerned, there is no A~B issue.\n>\n> You don't have to remind me about how hostile you are towards new\n> proposals.  I already know.\n\nThat's not \"hostile\" or \"new\".  I only express strong doubt against\n\"ideas\" (or non-\"ideas\") that do not make sense to me.\n\nThey may be valid and merely are not well explained, or they may be\ntotal nonsense.  The latter does not deserve time from people on\nthis list, but the former needs to be better explained.\n"}]}