Rebuild for Issue #95 and Issue #96

This commit is contained in:
Peter Cottle 2013-05-25 08:25:47 -07:00
parent 71488c6f4d
commit dc6d588a96
6 changed files with 9 additions and 7 deletions

View file

@ -53,6 +53,8 @@ git push
# go online and request a pull
```
You may also need to install jasmine-node globally to run the testing task, but the build should finish regardless.
## Helpful Folks
A big shoutout to these brave souls for extensively testing our sandbox and finding bugs and/or inconsistencies:

View file

@ -18280,7 +18280,7 @@ require.define("/levels/intro/rebasing.js",function(require,module,exports,__dir
"type": "GitDemonstrationView",
"options": {
"beforeMarkdowns": [
"Now we are checked out on the `master` branch. Let's do ahead and rebase onto `bugFix`..."
"Now we are checked out on the `master` branch. Let's go ahead and rebase onto `bugFix`..."
],
"afterMarkdowns": [
"There! Since `master` was downstream of `bugFix`, git simply moved the `master` branch reference forward in history."
@ -19022,7 +19022,7 @@ require.define("/levels/rampup/relativeRefs2.js",function(require,module,exports
"",
"你现在是相对引用的高手了,现在*用*他来实际做点事情。",
"",
"我使用相对引用最多的就是移动分支。你可以使用`-f`选项把直接让分支指向另一个提交亡灵。举个例子:",
"我使用相对引用最多的就是移动分支。你可以使用`-f`选项把直接让分支指向另一个提交。举个例子:",
"",
"`git branch -f master HEAD~3`",
"",
@ -34391,7 +34391,7 @@ require.define("/src/levels/intro/rebasing.js",function(require,module,exports,_
"type": "GitDemonstrationView",
"options": {
"beforeMarkdowns": [
"Now we are checked out on the `master` branch. Let's do ahead and rebase onto `bugFix`..."
"Now we are checked out on the `master` branch. Let's go ahead and rebase onto `bugFix`..."
],
"afterMarkdowns": [
"There! Since `master` was downstream of `bugFix`, git simply moved the `master` branch reference forward in history."
@ -35732,7 +35732,7 @@ require.define("/src/levels/rampup/relativeRefs2.js",function(require,module,exp
"",
"你现在是相对引用的高手了,现在*用*他来实际做点事情。",
"",
"我使用相对引用最多的就是移动分支。你可以使用`-f`选项把直接让分支指向另一个提交亡灵。举个例子:",
"我使用相对引用最多的就是移动分支。你可以使用`-f`选项把直接让分支指向另一个提交。举个例子:",
"",
"`git branch -f master HEAD~3`",
"",

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
build/bundle.min.js vendored

File diff suppressed because one or more lines are too long

View file

@ -426,7 +426,7 @@
For a much easier time perusing the source, see the individual files at:
https://github.com/pcottle/learnGitBranching
-->
<script src="build/bundle.min.0de74cdc.js"></script>
<script src="build/bundle.min.e5ccba29.js"></script>
<!-- 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