{"thread":{"id":"15305","subject":"[PATCH] Correct documentation wording for diff options -S and --pickaxe-all","startedAt":"2008-08-31T23:03:04Z","lastAt":"2008-08-31T23:59:57Z","messageCount":3,"participants":["Heikki Orsila","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"89345","messageId":"20080831230304.GA30480@zakalwe.fi","threadId":"15305","inReplyTo":null,"subject":"[PATCH] Correct documentation wording for diff options -S and --pickaxe-all","fromName":"Heikki Orsila","fromEmail":"heikki.orsila@iki.fi","sentAt":"2008-08-31T23:03:04Z","receivedAt":"2008-08-31T23:03:04Z","isPatch":true,"sender":{"key":"heikki.orsila@iki.fi","avatar":null},"body":"Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi>\n---\n Documentation/diff-options.txt |    6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt\nindex 1759386..062a8ae 100644\n--- a/Documentation/diff-options.txt\n+++ b/Documentation/diff-options.txt\n@@ -160,12 +160,12 @@ endif::git-format-patch[]\n \tnumber.\n \n -S<string>::\n-\tLook for differences that contain the change in <string>.\n+\tLook for differences that contain <string> in the change.\n \n --pickaxe-all::\n \tWhen -S finds a change, show all the changes in that\n-\tchangeset, not just the files that contain the change\n-\tin <string>.\n+\tchangeset, not just the files that contain <string>\n+\tin the change.\n \n --pickaxe-regex::\n \tMake the <string> not a plain string but an extended POSIX\n-- \n1.6.0.1\n"},{"id":"89346","messageId":"7v63pg3h4o.fsf@gitster.siamese.dyndns.org","threadId":"15305","inReplyTo":"20080831230304.GA30480@zakalwe.fi","subject":"Re: [PATCH] Correct documentation wording for diff options -S and --pickaxe-all","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-08-31T23:21:43Z","receivedAt":"2008-08-31T23:21:43Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Heikki Orsila <heikki.orsila@iki.fi> writes:\n\n> Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi>\n> ---\n>  Documentation/diff-options.txt |    6 +++---\n>  1 files changed, 3 insertions(+), 3 deletions(-)\n>\n> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt\n> index 1759386..062a8ae 100644\n> --- a/Documentation/diff-options.txt\n> +++ b/Documentation/diff-options.txt\n> @@ -160,12 +160,12 @@ endif::git-format-patch[]\n>  \tnumber.\n>  \n>  -S<string>::\n> -\tLook for differences that contain the change in <string>.\n> +\tLook for differences that contain <string> in the change.\n>  \n>  --pickaxe-all::\n>  \tWhen -S finds a change, show all the changes in that\n> -\tchangeset, not just the files that contain the change\n> -\tin <string>.\n> +\tchangeset, not just the files that contain <string>\n> +\tin the change.\n\n\nThanks, but if we are doing this, we should reword it to something less\nmisleading.  The pickaxe search does not look for changes that contains\nstring in the sense people might expect (e.g. \"diff -u0 | grep string\").\n\nThe machinery looks at the old and new copy, and considers it a match if\nthey have different numbers of \"string\" in them.\n\nSo perhaps something like this\n\n-S<string>::\n\tLook for differences that changes the number of <string> in the\n\tfile.\n\n--pickaxe-all::\n\tWhen -S finds a change, show all the changes in that changeset,\n        not just the files for which the number of <string> in them\n\tchanges.\n\nbut I am bad at writing, so I'll ask others to come up with a better\nwording.\n"},{"id":"89348","messageId":"20080831235957.GB16289@zakalwe.fi","threadId":"15305","inReplyTo":"7v63pg3h4o.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Correct documentation wording for diff options -S and --pickaxe-all","fromName":"Heikki Orsila","fromEmail":"shdl@zakalwe.fi","sentAt":"2008-08-31T23:59:57Z","receivedAt":"2008-08-31T23:59:57Z","isPatch":true,"sender":{"key":"shdl@zakalwe.fi","avatar":null},"body":"On Sun, Aug 31, 2008 at 04:21:43PM -0700, Junio C Hamano wrote:\n> Thanks, but if we are doing this, we should reword it to something less\n> misleading.  The pickaxe search does not look for changes that contains\n> string in the sense people might expect (e.g. \"diff -u0 | grep string\").\n> \n> The machinery looks at the old and new copy, and considers it a match if\n> they have different numbers of \"string\" in them.\n> \n> So perhaps something like this\n> \n> -S<string>::\n> \tLook for differences that changes the number of <string> in the\n> \tfile.\n> \n> --pickaxe-all::\n> \tWhen -S finds a change, show all the changes in that changeset,\n>         not just the files for which the number of <string> in them\n> \tchanges.\n> \n> but I am bad at writing, so I'll ask others to come up with a better\n> wording.\n\nPerhaps like this:\n\n-S:\n\"Look for differences that change the number of <string> matches in a file.\nIn other words, moving the <string> inside a file does not imply a \nmatch, but adding or removing <string> will.\"\n\n-- \nHeikki Orsila\nheikki.orsila@iki.fi\nhttp://www.iki.fi/shd\n"}]}