Skip to content

Commit d395745

Browse files
realsobekgitster
authored andcommitted
doc: git-pull.txt use US spelling, fix minor typo
Signed-off-by: René Genz <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 49800c9 commit d395745

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Documentation/git-pull.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ with uncommitted changes is discouraged: while possible, it leaves you
6767
in a state that may be hard to back out of in the case of a conflict.
6868

6969
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.
7171
It is generally best to get any local changes in working order before
7272
pulling or stash them away with linkgit:git-stash[1].
7373

@@ -210,7 +210,8 @@ EXAMPLES
210210
current branch:
211211
+
212212
------------------------------------------------
213-
$ git pull, git pull origin
213+
$ git pull
214+
$ git pull origin
214215
------------------------------------------------
215216
+
216217
Normally the branch merged in is the HEAD of the remote repository,

0 commit comments

Comments
 (0)