mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-07-11 15:14:27 +02:00
Improve punctuation in advanced level 1.
This commit is contained in:
parent
57db1be39e
commit
2c44f37880
1 changed files with 6 additions and 6 deletions
|
@ -23,7 +23,7 @@ exports.level = {
|
||||||
"",
|
"",
|
||||||
"Git will normally follow the \"first\" parent upwards from a merge commit, but specifying a number with `^` changes this default behavior.",
|
"Git will normally follow the \"first\" parent upwards from a merge commit, but specifying a number with `^` changes this default behavior.",
|
||||||
"",
|
"",
|
||||||
"Enough talking, let's see it in action",
|
"Enough talking, let's see it in action.",
|
||||||
""
|
""
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
@ -37,7 +37,7 @@ exports.level = {
|
||||||
"(*In our visuals, the first parent is positioned directly above the merge commit.*)"
|
"(*In our visuals, the first parent is positioned directly above the merge commit.*)"
|
||||||
],
|
],
|
||||||
"afterMarkdowns": [
|
"afterMarkdowns": [
|
||||||
"Easy -- this is what we are all used to"
|
"Easy -- this is what we are all used to."
|
||||||
],
|
],
|
||||||
"command": "git checkout master^",
|
"command": "git checkout master^",
|
||||||
"beforeCommand": "git checkout HEAD^; git commit; git checkout master; git merge C2"
|
"beforeCommand": "git checkout HEAD^; git commit; git checkout master; git merge C2"
|
||||||
|
@ -47,10 +47,10 @@ exports.level = {
|
||||||
"type": "GitDemonstrationView",
|
"type": "GitDemonstrationView",
|
||||||
"options": {
|
"options": {
|
||||||
"beforeMarkdowns": [
|
"beforeMarkdowns": [
|
||||||
"Now lets try specifying the second parent instead..."
|
"Now let's try specifying the second parent instead..."
|
||||||
],
|
],
|
||||||
"afterMarkdowns": [
|
"afterMarkdowns": [
|
||||||
"See! We followed the other parent upwards"
|
"See? We followed the other parent upwards."
|
||||||
],
|
],
|
||||||
"command": "git checkout master^2",
|
"command": "git checkout master^2",
|
||||||
"beforeCommand": "git checkout HEAD^; git commit; git checkout master; git merge C2"
|
"beforeCommand": "git checkout HEAD^; git commit; git checkout master; git merge C2"
|
||||||
|
@ -63,7 +63,7 @@ exports.level = {
|
||||||
"The `^` and `~` modifiers can make moving around a commit tree very powerful:"
|
"The `^` and `~` modifiers can make moving around a commit tree very powerful:"
|
||||||
],
|
],
|
||||||
"afterMarkdowns": [
|
"afterMarkdowns": [
|
||||||
"Lightning fast"
|
"Lightning fast!"
|
||||||
],
|
],
|
||||||
"command": "git checkout HEAD~; git checkout HEAD^2; git checkout HEAD~2",
|
"command": "git checkout HEAD~; git checkout HEAD^2; git checkout HEAD~2",
|
||||||
"beforeCommand": "git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"
|
"beforeCommand": "git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"
|
||||||
|
@ -76,7 +76,7 @@ exports.level = {
|
||||||
"Even crazier, these modifiers can be chained together! Check this out:"
|
"Even crazier, these modifiers can be chained together! Check this out:"
|
||||||
],
|
],
|
||||||
"afterMarkdowns": [
|
"afterMarkdowns": [
|
||||||
"The same movement as before, but all in one command"
|
"The same movement as before, but all in one command."
|
||||||
],
|
],
|
||||||
"command": "git checkout HEAD~^2~2",
|
"command": "git checkout HEAD~^2~2",
|
||||||
"beforeCommand": "git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"
|
"beforeCommand": "git commit; git checkout C0; git commit; git commit; git commit; git checkout master; git merge C5; git commit"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue