doc: git-pull.txt use US spelling, fix minor typo
Signed-off-by: René Genz <liebundartig@freenet.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Genz committed
Apr 30, 2017 at 16:54 UTC
d395745d8108568934006c6411146bc93cc54737
1 file changed
+3
-2
Documentation/git-pull.txt
+3
-2
@@ -67,7 +67,7 @@ with uncommitted changes is discouraged: while possible, it leaves you
67
in a state that may be hard to back out of in the case of a conflict.
68
69
If any of the remote changes overlap with local uncommitted changes,
70
-the merge will be automatically cancelled and the work tree untouched.
70
+the merge will be automatically canceled and the work tree untouched.
71
It is generally best to get any local changes in working order before
72
pulling or stash them away with linkgit:git-stash[1].
73
@@ -210,7 +210,8 @@ EXAMPLES
210
current branch:
211
+
212
------------------------------------------------
213
-$ git pull, git pull origin
213
+$ git pull
214
+$ git pull origin
215
------------------------------------------------
216
+
217
Normally the branch merged in is the HEAD of the remote repository,