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

delay update

Browse source
This commit is contained in:
Peter Cottle 2013-01-11 12:40:25 -08:00
parent ce87c01fd1
commit 67817f0cdb
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build/bundle.js
View file

@ -6457,7 +6457,7 @@ var init = function() {
[ [
"gc; git checkout HEAD~1; git commit; git checkout -b bugFix; gc;", "gc; git checkout HEAD~1; git commit; git checkout -b bugFix; gc;",
"git rebase -i HEAD~3; git rebase master; git checkout master; gc;", "git rebase -i HEAD~3; git rebase master; git checkout master; gc;",
"git merge bugFix; levels; level rebase1; show goal; delay 3000;", "git merge bugFix; levels; level rebase1; show goal; delay 1000;",
"git checkout -b win; git commit; help" "git checkout -b win; git commit; help"
].join('')); ].join(''));
}); });
@ -17677,7 +17677,7 @@ var init = function() {
[ [
"gc; git checkout HEAD~1; git commit; git checkout -b bugFix; gc;", "gc; git checkout HEAD~1; git commit; git checkout -b bugFix; gc;",
"git rebase -i HEAD~3; git rebase master; git checkout master; gc;", "git rebase -i HEAD~3; git rebase master; git checkout master; gc;",
"git merge bugFix; levels; level rebase1; show goal; delay 3000;", "git merge bugFix; levels; level rebase1; show goal; delay 1000;",
"git checkout -b win; git commit; help" "git checkout -b win; git commit; help"
].join('')); ].join(''));
}); });

2
src/js/app/index.js
View file

@ -124,7 +124,7 @@ var init = function() {
[ [
"gc; git checkout HEAD~1; git commit; git checkout -b bugFix; gc;", "gc; git checkout HEAD~1; git commit; git checkout -b bugFix; gc;",
"git rebase -i HEAD~3; git rebase master; git checkout master; gc;", "git rebase -i HEAD~3; git rebase master; git checkout master; gc;",
"git merge bugFix; levels; level rebase1; show goal; delay 3000;", "git merge bugFix; levels; level rebase1; show goal; delay 1000;",
"git checkout -b win; git commit; help" "git checkout -b win; git commit; help"
].join('')); ].join(''));
}); });

1
todo.txt
View file

@ -28,6 +28,7 @@ Ideas for cleaning
Done things: Done things:
(I only started this on Dec 17th 2012 to get a better sense of what was done) (I only started this on Dec 17th 2012 to get a better sense of what was done)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
[x] optimistic parsing of level and level builder commands, man that was toughwith circular imports
[x] edit dialog [x] edit dialog
[x] level builder dialog builder [x] level builder dialog builder
[x] level builder dialog tester [x] level builder dialog tester