Re: [PATCH] doc: git-pull.txt use US spelling, fix minor typo

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 24, 2017, 02:55 UTC
Message-ID: <xmqq1ssi345x.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <1492965925-29744-1-git-send-email-liebundartig@freenet.de>

René Genz <liebundartig@freenet.de> writes:

> ---

Missing sign-off.  Otherwise all good changes.  Thanks.

Show 32 quoted lines

> Instead of using two command lines I could have replaced the comma with a semicolon.
>
> I do not mind, if this patch is squashed into the other minor typo fixes of mine:
> 3c228f462d02e76956062b8d8572158cbcdbbc7b
>
>
>  Documentation/git-pull.txt | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
> index 4470e4b..942af8e 100644
> --- a/Documentation/git-pull.txt
> +++ b/Documentation/git-pull.txt
> @@ -67,7 +67,7 @@ with uncommitted changes is discouraged: while possible, it leaves you
>  in a state that may be hard to back out of in the case of a conflict.
>  
>  If any of the remote changes overlap with local uncommitted changes,
> -the merge will be automatically cancelled and the work tree untouched.
> +the merge will be automatically canceled and the work tree untouched.
>  It is generally best to get any local changes in working order before
>  pulling or stash them away with linkgit:git-stash[1].
>  
> @@ -210,7 +210,8 @@ EXAMPLES
>    current branch:
>  +
>  ------------------------------------------------
> -$ git pull, git pull origin
> +$ git pull
> +$ git pull origin
>  ------------------------------------------------
>  +
>  Normally the branch merged in is the HEAD of the remote repository,