From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.0 required=3.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 89EBE207BD for ; Sun, 23 Apr 2017 16:51:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S971371AbdDWQtO (ORCPT ); Sun, 23 Apr 2017 12:49:14 -0400 Received: from mout0.freenet.de ([195.4.92.90]:51475 "EHLO mout0.freenet.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S971343AbdDWQtM (ORCPT ); Sun, 23 Apr 2017 12:49:12 -0400 Received: from [195.4.92.141] (helo=mjail1.freenet.de) by mout0.freenet.de with esmtpa (ID liebundartig@freenet.de) (port 25) (Exim 4.85 #1) id 1d2KhC-0007VD-90; Sun, 23 Apr 2017 18:49:10 +0200 Received: from localhost ([::1]:52424 helo=mjail1.freenet.de) by mjail1.freenet.de with esmtpa (ID liebundartig@freenet.de) (Exim 4.85 #1) id 1d2KhB-0004OB-BI; Sun, 23 Apr 2017 18:49:09 +0200 Received: from mx4.freenet.de ([195.4.92.14]:56781) by mjail1.freenet.de with esmtpa (ID liebundartig@freenet.de) (Exim 4.85 #1) id 1d2Kdl-0000bl-4I; Sun, 23 Apr 2017 18:45:37 +0200 Received: from p200300454467fa4464be414ec96be51f.dip0.t-ipconnect.de ([2003:45:4467:fa44:64be:414e:c96b:e51f]:48175) by mx4.freenet.de with esmtpsa (ID liebundartig@freenet.de) (TLSv1.2:AES128-SHA256:128) (port 465) (Exim 4.85 #1) id 1d2Kdl-0003iG-Qb; Sun, 23 Apr 2017 18:45:37 +0200 From: =?UTF-8?q?Ren=C3=A9=20Genz?= To: git@vger.kernel.org Cc: gitster@pobox.com, =?UTF-8?q?Ren=C3=A9=20Genz?= Subject: [PATCH] doc: git-pull.txt use US spelling, fix minor typo Date: Sun, 23 Apr 2017 18:45:25 +0200 Message-Id: <1492965925-29744-1-git-send-email-liebundartig@freenet.de> X-Mailer: git-send-email 1.9.1 X-Originated-At: 2003:45:4467:fa44:64be:414e:c96b:e51f!48175 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org --- 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, -- 1.9.1