mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-26 16:08:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

details

Browse source
This commit is contained in:
Peter Cottle 2013-10-26 11:39:29 -07:00
parent 48f59ffc80
commit 67d2352fa2
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/js/visuals/visualization.js
View file

@ -151,6 +151,9 @@ var Visualization = Backbone.View.extend({
fadeTreeIn: function() { fadeTreeIn: function() {
this.shown = true; this.shown = true;
if (!this.paper.canvas) {
return;
}
$(this.paper.canvas).animate({opacity: 1}, this.getAnimationTime()); $(this.paper.canvas).animate({opacity: 1}, this.getAnimationTime());
this.originToo('fadeTreeIn', arguments); this.originToo('fadeTreeIn', arguments);

4
src/levels/remote/pushArgs2.js
View file

@ -6,7 +6,7 @@ exports.level = {
"en_US": "Git push arguments -- Expanded!" "en_US": "Git push arguments -- Expanded!"
}, },
"hint": { "hint": {
"en_US": "Remember you can admit defeat and type in \"see solution\" :P" "en_US": "Remember you can admit defeat and type in \"show solution\" :P"
}, },
"startDialog": { "startDialog": {
"en_US": { "en_US": {
@ -48,7 +48,7 @@ exports.level = {
"Remember, `source` is any location that git will understand:" "Remember, `source` is any location that git will understand:"
], ],
"afterMarkdowns": [ "afterMarkdowns": [
"Woah! That's a pretty trippy command but it makes sense -- git resolved `foo^` into a location, uploaded whatever commits weren't present yet, and then updated destination." "Woah! That's a pretty trippy command but it makes sense -- git resolved `foo^` into a location, uploaded whatever commits that weren't present yet on the remote, and then updated destination."
], ],
"command": "git push origin foo^:master", "command": "git push origin foo^:master",
"beforeCommand": "git clone; go -b foo; git commit; git commit" "beforeCommand": "git clone; go -b foo; git commit; git commit"