readme stuff

This commit is contained in:
Peter Cottle 2012-11-04 16:56:19 -08:00
parent 04cb00e86a
commit 98be824e0f
4 changed files with 30 additions and 11 deletions

10
README
View file

@ -1,10 +0,0 @@
Hi
== contributors ==
Nikita Kouevda
Maksim Ioffe
Dan Miller

27
README.md Normal file
View file

@ -0,0 +1,27 @@
# LearnGitBranching
==================
LearnGitBranching is a pseudo-git sandbox and interactive series of tutorials / challenges to accelerate the understanding of how git commit trees work. It supports a fairly wide range of commands and dynamically visualizes the effects each change has on a commit tree visualization next to the command box:
<img src="http://petercottle.com/miscPics/learnGitBranching.png"/>
## Sandbox Mode
Levels
===============
## Level Builder
## Contributing Levels
Contributing
===============
Helpful Folks
-------------------
A big shoutout to these brave souls for extensively testing our sandbox and finding bugs or inconsistencies:
* Nikita Kouevda
* Maksim Ioffe
* Dan Miller

View file

@ -1051,7 +1051,7 @@ GitEngine.prototype.mergeStarter = function() {
return; return;
} }
animationFactory.genCommitBirthAnimation(this.animationQueue, newCommit); animationFactory.genCommitBirthAnimation(this.animationQueue, newCommit, this.gitVisuals);
}; };
GitEngine.prototype.merge = function(targetSource, currentLocation) { GitEngine.prototype.merge = function(targetSource, currentLocation) {

View file

@ -11,6 +11,8 @@ Big things:
Medium things: Medium things:
~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
- gitEngine loads from tree immediately, not the weird thing we have now! - gitEngine loads from tree immediately, not the weird thing we have now!
- git help better (use option map)
- help better
Small things to implement: Small things to implement:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~