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

rebuild for Issue #55

Browse source
This commit is contained in:
Peter Cottle 2013-02-23 23:37:05 -08:00
parent d99498076e
commit 5e7042c64b
4 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
build/bundle.js
View file

@ -18738,7 +18738,7 @@ require.define("/levels/mixed/1.js",function(require,module,exports,__dirname,__
"* `git rebase -i`", "* `git rebase -i`",
"* `git cherry-pick`", "* `git cherry-pick`",
"", "",
"Interactive (the `-i`) rebasing allows you to chose which commits you want to keep or discard. It also allows you to reorder commits. This can be helpful if you want to toss out some work.", "Interactive (the `-i`) rebasing allows you to choose which commits you want to keep or discard. It also allows you to reorder commits. This can be helpful if you want to toss out some work.",
"", "",
"Cherry-picking allows you to pick individual commits and plop them down on top of `HEAD`" "Cherry-picking allows you to pick individual commits and plop them down on top of `HEAD`"
] ]
@ -18838,6 +18838,7 @@ require.define("/levels/mixed/1.js",function(require,module,exports,__dirname,__
} }
} }
}; };
}); });
require.define("/levels/mixed/2.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = { require.define("/levels/mixed/2.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = {
@ -18882,7 +18883,7 @@ require.define("/levels/mixed/2.js",function(require,module,exports,__dirname,__
"* We will re-order the commits so the one we want to change is on top with `git rebase -i`", "* We will re-order the commits so the one we want to change is on top with `git rebase -i`",
"* We will `commit --amend` to make the slight modification", "* We will `commit --amend` to make the slight modification",
"* Then we will re-order the commits back to how they were previously with `git rebase -i`", "* Then we will re-order the commits back to how they were previously with `git rebase -i`",
"* Finally, we will move master to this updated part of the tree to finish the level (via your method of choosing)", "* Finally, we will move master to this updated part of the tree to finish the level (via the method of your choosing)",
"", "",
"There are many ways to accomplish this overall goal (I see you eye-ing cherry-pick), and we will see more of them later, but for now let's focus on this technique." "There are many ways to accomplish this overall goal (I see you eye-ing cherry-pick), and we will see more of them later, but for now let's focus on this technique."
] ]
@ -18978,6 +18979,7 @@ require.define("/levels/mixed/2.js",function(require,module,exports,__dirname,__
} }
} }
}; };
}); });
require.define("/levels/mixed/3.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = { require.define("/levels/mixed/3.js",function(require,module,exports,__dirname,__filename,process,global){exports.level = {
@ -31654,7 +31656,7 @@ require.define("/src/levels/mixed/1.js",function(require,module,exports,__dirnam
"* `git rebase -i`", "* `git rebase -i`",
"* `git cherry-pick`", "* `git cherry-pick`",
"", "",
"Interactive (the `-i`) rebasing allows you to chose which commits you want to keep or discard. It also allows you to reorder commits. This can be helpful if you want to toss out some work.", "Interactive (the `-i`) rebasing allows you to choose which commits you want to keep or discard. It also allows you to reorder commits. This can be helpful if you want to toss out some work.",
"", "",
"Cherry-picking allows you to pick individual commits and plop them down on top of `HEAD`" "Cherry-picking allows you to pick individual commits and plop them down on top of `HEAD`"
] ]
@ -31754,6 +31756,7 @@ require.define("/src/levels/mixed/1.js",function(require,module,exports,__dirnam
} }
} }
}; };
}); });
require("/src/levels/mixed/1.js"); require("/src/levels/mixed/1.js");
@ -31799,7 +31802,7 @@ require.define("/src/levels/mixed/2.js",function(require,module,exports,__dirnam
"* We will re-order the commits so the one we want to change is on top with `git rebase -i`", "* We will re-order the commits so the one we want to change is on top with `git rebase -i`",
"* We will `commit --amend` to make the slight modification", "* We will `commit --amend` to make the slight modification",
"* Then we will re-order the commits back to how they were previously with `git rebase -i`", "* Then we will re-order the commits back to how they were previously with `git rebase -i`",
"* Finally, we will move master to this updated part of the tree to finish the level (via your method of choosing)", "* Finally, we will move master to this updated part of the tree to finish the level (via the method of your choosing)",
"", "",
"There are many ways to accomplish this overall goal (I see you eye-ing cherry-pick), and we will see more of them later, but for now let's focus on this technique." "There are many ways to accomplish this overall goal (I see you eye-ing cherry-pick), and we will see more of them later, but for now let's focus on this technique."
] ]
@ -31895,6 +31898,7 @@ require.define("/src/levels/mixed/2.js",function(require,module,exports,__dirnam
} }
} }
}; };
}); });
require("/src/levels/mixed/2.js"); require("/src/levels/mixed/2.js");

2
build/bundle.min.2076073f.js → build/bundle.min.71a24b09.js
View file

File diff suppressed because one or more lines are too long

2
build/bundle.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
index.html
View file

@ -410,7 +410,7 @@
For a much easier time perusing the source, see the individual files at: For a much easier time perusing the source, see the individual files at:
https://github.com/pcottle/learnGitBranching https://github.com/pcottle/learnGitBranching
--> -->
<script src="build/bundle.min.2076073f.js"></script> <script src="build/bundle.min.71a24b09.js"></script>
<!-- The advantage of github pages: super-easy, simple, slick static hostic. <!-- The advantage of github pages: super-easy, simple, slick static hostic.
The downside? No raw logs to parse for analytics, so I have to include The downside? No raw logs to parse for analytics, so I have to include