Merge branch 'more-zh-translation' of git://github.com/dotnil/learnGitBranching into dotnil

Issue #74
This commit is contained in:
Peter Cottle 2013-03-07 20:19:12 -08:00
parent b3c6b6de66
commit 6fdcbbcee1
9 changed files with 149 additions and 38 deletions

View file

@ -10,7 +10,7 @@ exports.level = {
"name": {
"ko": "커밋들 갖고 놀기",
"en_US": "Juggling Commits",
"zh_CN": "Git提交戏法"
"zh_CN": "提交变换戏法"
},
"hint": {
"en_US": "The first command is git rebase -i HEAD~2",
@ -63,7 +63,7 @@ exports.level = {
"type": "ModalAlert",
"options": {
"markdowns": [
"## Juggling Commits",
"## 提交变换戏法",
"",
"下面这种情况也是经常出现的。例如你之前已经在 `newImage` 分支上做了一些提交,然后又在 `caption` 分支上做了一些相关的提交因此它们看起来是一个连一个的stacked on top of each other in your repository。",
"",