{"thread":{"id":"45781","subject":"[PATCH] doc: git-pull.txt use US spelling, fix minor typo","startedAt":"2017-04-23T16:51:43Z","lastAt":"2017-04-24T02:55:47Z","messageCount":2,"participants":["René Genz","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"317565","messageId":"1492965925-29744-1-git-send-email-liebundartig@freenet.de","threadId":"45781","inReplyTo":null,"subject":"[PATCH] doc: git-pull.txt use US spelling, fix minor typo","fromName":"René Genz","fromEmail":"liebundartig@freenet.de","sentAt":"2017-04-23T16:45:25Z","receivedAt":"2017-04-23T16:51:43Z","isPatch":true,"sender":{"key":"liebundartig@freenet.de","avatar":"https://avatars.githubusercontent.com/u/18424198?v=4"},"body":"---\nInstead of using two command lines I could have replaced the comma with a semicolon.\n\nI do not mind, if this patch is squashed into the other minor typo fixes of mine:\n3c228f462d02e76956062b8d8572158cbcdbbc7b\n\n\n Documentation/git-pull.txt | 5 +++--\n 1 file changed, 3 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\nindex 4470e4b..942af8e 100644\n--- a/Documentation/git-pull.txt\n+++ b/Documentation/git-pull.txt\n@@ -67,7 +67,7 @@ with uncommitted changes is discouraged: while possible, it leaves you\n in a state that may be hard to back out of in the case of a conflict.\n \n If any of the remote changes overlap with local uncommitted changes,\n-the merge will be automatically cancelled and the work tree untouched.\n+the merge will be automatically canceled and the work tree untouched.\n It is generally best to get any local changes in working order before\n pulling or stash them away with linkgit:git-stash[1].\n \n@@ -210,7 +210,8 @@ EXAMPLES\n   current branch:\n +\n ------------------------------------------------\n-$ git pull, git pull origin\n+$ git pull\n+$ git pull origin\n ------------------------------------------------\n +\n Normally the branch merged in is the HEAD of the remote repository,\n-- \n1.9.1\n\n"},{"id":"317632","messageId":"xmqq1ssi345x.fsf@gitster.mtv.corp.google.com","threadId":"45781","inReplyTo":"1492965925-29744-1-git-send-email-liebundartig@freenet.de","subject":"Re: [PATCH] doc: git-pull.txt use US spelling, fix minor typo","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-04-24T02:55:38Z","receivedAt":"2017-04-24T02:55:47Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"René Genz <liebundartig@freenet.de> writes:\n\n> ---\n\nMissing sign-off.  Otherwise all good changes.  Thanks.\n\n> Instead of using two command lines I could have replaced the comma with a semicolon.\n>\n> I do not mind, if this patch is squashed into the other minor typo fixes of mine:\n> 3c228f462d02e76956062b8d8572158cbcdbbc7b\n>\n>\n>  Documentation/git-pull.txt | 5 +++--\n>  1 file changed, 3 insertions(+), 2 deletions(-)\n>\n> diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt\n> index 4470e4b..942af8e 100644\n> --- a/Documentation/git-pull.txt\n> +++ b/Documentation/git-pull.txt\n> @@ -67,7 +67,7 @@ with uncommitted changes is discouraged: while possible, it leaves you\n>  in a state that may be hard to back out of in the case of a conflict.\n>  \n>  If any of the remote changes overlap with local uncommitted changes,\n> -the merge will be automatically cancelled and the work tree untouched.\n> +the merge will be automatically canceled and the work tree untouched.\n>  It is generally best to get any local changes in working order before\n>  pulling or stash them away with linkgit:git-stash[1].\n>  \n> @@ -210,7 +210,8 @@ EXAMPLES\n>    current branch:\n>  +\n>  ------------------------------------------------\n> -$ git pull, git pull origin\n> +$ git pull\n> +$ git pull origin\n>  ------------------------------------------------\n>  +\n>  Normally the branch merged in is the HEAD of the remote repository,\n"}]}