mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-03 19:24:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

translate some leftover sentence

Browse source
This commit is contained in:
东方孤思子（Paris·QianSen） 2014-10-11 04:21:38 +08:00
parent 7c69a79eab
commit cdd53cb92e
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/levels/remote/pullArgs.js
View file

@ -335,22 +335,21 @@ exports.level = {
"type": "ModalAlert", "type": "ModalAlert",
"options": { "options": {
"markdowns": [ "markdowns": [
"Here are some equivalent commands in git:",
"以下命令在 git 中是等价的:", "以下命令在 git 中是等价的:",
"", "",
"`git pull origin foo` is equal to:", "`git pull origin foo` 相当于：",
"", "",
"`git fetch origin foo; git merge o/foo`", "`git fetch origin foo; git merge o/foo`",
"", "",
"还有...", "还有...",
"", "",
"`git pull origin bar~1:bugFix` is equal to:", "`git pull origin bar~1:bugFix` 相当于：",
"", "",
"`git fetch origin bar~1:bugFix; git merge bugFix`", "`git fetch origin bar~1:bugFix; git merge bugFix`",
"", "",
"看到了? git pull 实际上就是fetch + merge的缩写, git pull 在乎的是提交在哪里结束(也就是git fetch所确定的destination)", "看到了? git pull 实际上就是fetch + merge的缩写, git pull 在乎的是提交在哪里结束(也就是git fetch所确定的destination)",
"", "",
"Lets see a demo:" "一起来看个例子吧："
] ]
} }
}, },