undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rg/doc-pull-typofix'

Browse Source 
* rg/doc-pull-typofix:
  doc: git-pull.txt use US spelling, fix minor typo
This commit is contained in:
Junio C Hamano 2017-05-04 16:26:45 +09:00
commit 741eaf7333
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. 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, 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 It is generally best to get any local changes in working order before
pulling or stash them away with linkgit:git-stash[1]. pulling or stash them away with linkgit:git-stash[1].
@ -210,7 +210,8 @@ EXAMPLES
current branch: current branch:
+ +
------------------------------------------------ ------------------------------------------------
$ git pull, git pull origin $ git pull
$ git pull origin
------------------------------------------------ ------------------------------------------------
+ +
Normally the branch merged in is the HEAD of the remote repository, Normally the branch merged in is the HEAD of the remote repository,