mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-10 14:44:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

update src/levels/rampup/relativeRefs2.js

Browse source
This commit is contained in:
mht 2013-12-10 11:30:37 +08:00
parent 267278514e
commit 570da344af
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/levels/rampup/relativeRefs2.js
View file

@ -5,7 +5,7 @@ exports.level = {
"hint": {
"en_US": "You'll need to use at least one direct reference (hash) to complete this level",
"zh_CN": "这一关至少要用到一次直接引用(hash)",
"zh_TW": "這一關至少要用到一次直接引用(hash)"
"zh_TW": "這一關至少要用到一次直接參考(hash)"
},
"name": {
"en_US": "Relative Refs #2 (~)",
@ -144,10 +144,10 @@ exports.level = {
"markdowns": [
"### The \"~\" operator",
"",
"假設需要在提交樹中向上移動很多步。使用多個`^`非常無聊，所以Git也引入了波浪(~)操作符。",
"假設需要在commit tree中向上移動多個commit。使用多個`^`會非常麻煩，所以Git也加入了波浪(~)的運算符號。",
"",
"",
"波浪操作符後面可以（可選地）跟一個數字，指定向上移動多少次。看個例子"
"波浪操作符號後面可以選擇一個數字（你也可以不選擇），該數字可以指定向上移動多少個commit。看個例子"
]
}
},
@ -155,10 +155,10 @@ exports.level = {
"type": "GitDemonstrationView",
"options": {
"beforeMarkdowns": [
"使用`~`一次後退多步."
"使用`~`一次往上移動多個commit."
],
"afterMarkdowns": [
"唰！如此簡潔--相對引用就是好啊！"
"哇！太簡潔了--相對引用真的很好用！"
],
"command": "git checkout HEAD~4",
"beforeCommand": "git commit; git commit; git commit"
@ -172,11 +172,11 @@ exports.level = {
"",
"你現在是相對引用的高手了，現在*用*他來實際做點事情。",
"",
"我使用相對引用最多的就是移動分支。你可以使用`-f`選項把直接讓分支指向另一個提交。舉個例子:",
"我使用相對引用最多的就是移動分支。你可以使用`-f`選項直接讓分支指向另一個commit。舉個例子:",
"",
"`git branch -f master HEAD~3`",
"",
"（強制）移動master指向HEAD的第3級父提交。"
"（強制）移動master指向HEAD往上的第三個parent commit。"
]
}
},
@ -184,7 +184,7 @@ exports.level = {
"type": "ModalAlert",
"options": {
"markdowns": [
"要完成此關，移動`HEAD`，`master`和`bugFix`到目標所示的位置。"
"要完成這一關，移動`HEAD`，`master`和`bugFix`到目標所示的位置。"
]
}
}