mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-09 05:56:15 +02:00
Code

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>
This commit is contained in:
René Genz 2017-04-30 16:54:25 +02:00 committed by Junio C Hamano
parent 49800c9407
commit d395745d81
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-pull.txt
View File

@ -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,