{"thread":{"id":"50755","subject":"[PATCH] doc: fix typos in man pages","startedAt":"2019-03-16T10:44:18Z","lastAt":"2019-03-18T08:54:12Z","messageCount":4,"participants":["Alexander Blesius","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"371649","messageId":"6e00f5fc-13a3-a9b9-d964-f787ae194a73@blesius.eu","threadId":"50755","inReplyTo":null,"subject":"[PATCH] doc: fix typos in man pages","fromName":"Alexander Blesius","fromEmail":"alexander+git@blesius.eu","sentAt":"2019-03-16T10:34:39Z","receivedAt":"2019-03-16T10:44:18Z","isPatch":true,"sender":{"key":"alexander+git@blesius.eu","avatar":null},"body":"Signed-off-by: Alexander Blesius \n---\n Documentation/git-worktree.txt | 4 ++--\n Documentation/gitattributes.txt | 4 ++--\n 2 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt\nindex cb86318f3e..fa5ec7a5dc 100644\n--- a/Documentation/git-worktree.txt\n+++ b/Documentation/git-worktree.txt\n@@ -213,8 +213,8 @@ refs of one working tree from another.\n In general, all pseudo refs are per working tree and all refs starting\n with \"refs/\" are shared. Pseudo refs are ones like HEAD which are\n-directly under GIT_DIR instead of inside GIT_DIR/refs. There are one\n-exception to this: refs inside refs/bisect and refs/worktree is not\n+directly under GIT_DIR instead of inside GIT_DIR/refs. There is one\n+exception to this: refs inside refs/bisect and refs/worktree are not\n shared.\n Refs that are per working tree can still be accessed from another\ndiff --git a/Documentation/gitattributes.txt\nb/Documentation/gitattributes.txt\nindex 9b41f81c06..908d9a3009 100644\n--- a/Documentation/gitattributes.txt\n+++ b/Documentation/gitattributes.txt\n@@ -314,8 +314,8 @@ stored as UTF-8 internally. A client without\n`working-tree-encoding`\n support will checkout `foo.ps1` as UTF-8 encoded file. This will\n typically cause trouble for the users of this file.\n +\n-If a Git client, that does not support the `working-tree-encoding`\n-attribute, adds a new file `bar.ps1`, then `bar.ps1` will be\n+If a Git client that does not support the `working-tree-encoding`\n+attribute adds a new file `bar.ps1`, then `bar.ps1` will be\n stored \"as-is\" internally (in this example probably as UTF-16).\n A client with `working-tree-encoding` support will interpret the\n internal contents as UTF-8 and try to convert it to UTF-16 on checkout.\n-- \n2.21.0\n\n\n\n\n"},{"id":"371776","messageId":"xmqqef744u2f.fsf@gitster-ct.c.googlers.com","threadId":"50755","inReplyTo":"6e00f5fc-13a3-a9b9-d964-f787ae194a73@blesius.eu","subject":"Re: [PATCH] doc: fix typos in man pages","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-03-18T05:42:32Z","receivedAt":"2019-03-18T05:42:36Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Alexander Blesius writes:\n\n> Signed-off-by: Alexander Blesius \n> ---\n> Documentation/git-worktree.txt | 4 ++--\n> Documentation/gitattributes.txt | 4 ++--\n> 2 files changed, 4 insertions(+), 4 deletions(-)\n>\n> diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt\n> index cb86318f3e..fa5ec7a5dc 100644\n> --- a/Documentation/git-worktree.txt\n> +++ b/Documentation/git-worktree.txt\n> @@ -213,8 +213,8 @@ refs of one working tree from another.\n> In general, all pseudo refs are per working tree and all refs starting\n> with \"refs/\" are shared. Pseudo refs are ones like HEAD which are\n> -directly under GIT_DIR instead of inside GIT_DIR/refs. There are one\n> -exception to this: refs inside refs/bisect and refs/worktree is not\n> +directly under GIT_DIR instead of inside GIT_DIR/refs. There is one\n> +exception to this: refs inside refs/bisect and refs/worktree are not\n> shared.\n\nPerhaps bisect is one and worktree is the other, and that made them\ntwo things (plural) in the author's mind. But the single exception\nis about these two hierarchies, so \"is\" is correct ;-)\n\n> Refs that are per working tree can still be accessed from another\n> diff --git a/Documentation/gitattributes.txt\n> b/Documentation/gitattributes.txt\n> index 9b41f81c06..908d9a3009 100644\n> --- a/Documentation/gitattributes.txt\n> +++ b/Documentation/gitattributes.txt\n> @@ -314,8 +314,8 @@ stored as UTF-8 internally. A client without\n> `working-tree-encoding`\n> support will checkout `foo.ps1` as UTF-8 encoded file. This will\n> typically cause trouble for the users of this file.\n> +\n> -If a Git client, that does not support the `working-tree-encoding`\n> -attribute, adds a new file `bar.ps1`, then `bar.ps1` will be\n> +If a Git client that does not support the `working-tree-encoding`\n> +attribute adds a new file `bar.ps1`, then `bar.ps1` will be\n\nOr s/that/which/. I am not sure which one gives us a cleaner\nresult.\n\n If a new file `bar.ps1` is added by a Git client that does not\n understand `working-tree-encoding` attribute, then ...\n\nis how I may write it, though. I dunno. Let's take yours at least\nfor now and let others complain if they care deeply about it.\n\n> stored \"as-is\" internally (in this example probably as UTF-16).\n> A client with `working-tree-encoding` support will interpret the\n> internal contents as UTF-8 and try to convert it to UTF-16 on checkout.\n\nThanks.\n\n"},{"id":"371790","messageId":"xmqq7ecw1wxd.fsf@gitster-ct.c.googlers.com","threadId":"50755","inReplyTo":"6e00f5fc-13a3-a9b9-d964-f787ae194a73@blesius.eu","subject":"Re: [PATCH] doc: fix typos in man pages","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-03-18T07:09:02Z","receivedAt":"2019-03-18T07:09:07Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Alexander Blesius writes:\n\n> Signed-off-by: Alexander Blesius \n> ---\n> Documentation/git-worktree.txt | 4 ++--\n> Documentation/gitattributes.txt | 4 ++--\n> 2 files changed, 4 insertions(+), 4 deletions(-)\n>\n> diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt\n> index cb86318f3e..fa5ec7a5dc 100644\n> --- a/Documentation/git-worktree.txt\n> +++ b/Documentation/git-worktree.txt\n> @@ -213,8 +213,8 @@ refs of one working tree from another.\n> In general, all pseudo refs are per working tree and all refs starting\n> with \"refs/\" are shared. Pseudo refs are ones like HEAD which are\n> -directly under GIT_DIR instead of inside GIT_DIR/refs. There are one\n> -exception to this: refs inside refs/bisect and refs/worktree is not\n> +directly under GIT_DIR instead of inside GIT_DIR/refs. There is one\n> +exception to this: refs inside refs/bisect and refs/worktree are not\n> shared.\n> Refs that are per working tree can still be accessed from another\n> diff --git a/Documentation/gitattributes.txt\n> b/Documentation/gitattributes.txt\n\nOops. Like-wrapped patch. Please make sure your MUA does not\ncorrupt your patch before sending a patch the next time. With a\nsmall change like this, I can manually type the change and pretend\nas if I applied the patch, so no need to resend this particular one.\n\nThanks again.\n\n> index 9b41f81c06..908d9a3009 100644\n> --- a/Documentation/gitattributes.txt\n> +++ b/Documentation/gitattributes.txt\n> @@ -314,8 +314,8 @@ stored as UTF-8 internally. A client without\n> `working-tree-encoding`\n> support will checkout `foo.ps1` as UTF-8 encoded file. This will\n> typically cause trouble for the users of this file.\n> +\n> -If a Git client, that does not support the `working-tree-encoding`\n> -attribute, adds a new file `bar.ps1`, then `bar.ps1` will be\n> +If a Git client that does not support the `working-tree-encoding`\n> +attribute adds a new file `bar.ps1`, then `bar.ps1` will be\n> stored \"as-is\" internally (in this example probably as UTF-16).\n> A client with `working-tree-encoding` support will interpret the\n> internal contents as UTF-8 and try to convert it to UTF-16 on checkout.\n"},{"id":"371796","messageId":"9a283595-490e-81cd-9d88-4cc59ad893e9@blesius.eu","threadId":"50755","inReplyTo":"xmqqef744u2f.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH] doc: fix typos in man pages","fromName":"Alexander Blesius","fromEmail":"alexander+git@blesius.eu","sentAt":"2019-03-18T08:54:06Z","receivedAt":"2019-03-18T08:54:12Z","isPatch":true,"sender":{"key":"alexander+git@blesius.eu","avatar":null},"body":"On 18/03/2019 06:42, Junio C Hamano wrote:\n>> diff --git a/Documentation/gitattributes.txt\n>> b/Documentation/gitattributes.txt\n>> index 9b41f81c06..908d9a3009 100644\n>> --- a/Documentation/gitattributes.txt\n>> +++ b/Documentation/gitattributes.txt\n>> @@ -314,8 +314,8 @@ stored as UTF-8 internally. A client without\n>> `working-tree-encoding`\n>> support will checkout `foo.ps1` as UTF-8 encoded file. This will\n>> typically cause trouble for the users of this file.\n>> +\n>> -If a Git client, that does not support the `working-tree-encoding`\n>> -attribute, adds a new file `bar.ps1`, then `bar.ps1` will be\n>> +If a Git client that does not support the `working-tree-encoding`\n>> +attribute adds a new file `bar.ps1`, then `bar.ps1` will be\n> \n> Or s/that/which/. I am not sure which one gives us a cleaner\n> result.\n> \n> If a new file `bar.ps1` is added by a Git client that does not\n> understand `working-tree-encoding` attribute, then ...\n> \n> is how I may write it, though. I dunno. Let's take yours at least\n> for now and let others complain if they care deeply about it.\n> \n>> stored \"as-is\" internally (in this example probably as UTF-16).\n>> A client with `working-tree-encoding` support will interpret the\n>> internal contents as UTF-8 and try to convert it to UTF-16 on checkout.\n> \n> Thanks.\n> \n\n\nHi,\n\nsorry about the MUC wrapping, will be more careful next time :)\n\nAs I learned it, commas are used around relative clauses (sentences\nintroduced by \"that\", \"which\" etc.) only if they are non-defining, so if\nthe information inside that sentence is not necessary to understand the\nsentence. While I'm not a native speaker and therefore unsure how much\nthat would matter to a reader, I think it's better to use the\ngrammatically correct version to avoid ambiguity.\n\nThe question whether that or which shouldn't matter too much, I think\nboth can be used interchangeably here.\n\nThanks for your feedback!\n\nBest regards,\nAlex\n-- \nAlexander Blesius M.A.\n\nPlease consider encrypting your mails with PGP.\nhttps://emailselfdefense.fsf.org/de/\n\n"}]}