summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-04 07:26:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-04 07:26:45 (GMT)
commit741eaf7333e337a3098a1135fb05f1889c3183de (patch)
tree52a393206949bd68d655e7f949de13d742ac9a1c
parentfa675ebd998bcbf6192b95bb0fe70f345c06d07d (diff)
parentd395745d8108568934006c6411146bc93cc54737 (diff)
downloadgit-741eaf7333e337a3098a1135fb05f1889c3183de.zip
git-741eaf7333e337a3098a1135fb05f1889c3183de.tar.gz
git-741eaf7333e337a3098a1135fb05f1889c3183de.tar.bz2
Merge branch 'rg/doc-pull-typofix'
* rg/doc-pull-typofix: doc: git-pull.txt use US spelling, fix minor typo
-rw-r--r--Documentation/git-pull.txt5
1 files 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,