mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-28 06:35:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
2755 commits 7 branches 0 tags 104 MiB
Commit graph

1946 commits

Author SHA1 Message Date
Peter Cottle
06ca6b372a Merge pull request #34 from CameronWills/patch-1 
Update src/levels/intro/4.js
 2013-02-18 07:44:41 -08:00
Peter Cottle
a954a659ce Rebuilding for Lukes pull 2013-02-18 07:41:30 -08:00
Peter Cottle
25b1cda900 Merge pull request #32 from lkysow/master 
Added common git aliases to shortcuts.
 2013-02-18 07:37:16 -08:00
CameronWills
b42400c0c8 Update src/levels/intro/4.js 
Fixed minor typo in instructions.
 2013-02-18 22:34:25 +11:00
Hamish Macpherson
084071166d Tweaked window buttons and themes 2013-02-17 23:31:32 -08:00
Luke Kysow
3732e4e98d Added common git aliases. 
git ci => git commit,
git co => git checkout,
git st => git status,
git br => git branch
 2013-02-17 22:05:06 -08:00
Peter Cottle
7a8d4abb59 Fixes Issue #30 2013-02-17 17:09:33 -08:00
Peter Cottle
be2fa68a45 Fixes Issue #19 thanks a ton epheph 2013-02-17 16:52:21 -08:00
Peter Cottle
6de164e6a9 Merge pull request #27 from AdamBrodzinski/1_3_typo 
Fixes typo in lesson 1.3 alert steps modal
 2013-02-17 13:21:00 -08:00
Adam Brodzinski
734dd49634 Fixes typo in lesson 1.3 alert steps modal 
I noticed there's a typo in the 1.3 alert modal.  If you follow the
directions to the T, it won't pass because it commits to the wrong
branch.

It needs to say make a new branch called `bugFix`,
then `git checkout bugFix`, then commit.

Screenshot with commands in working order:
http://cl.ly/image/3V0n192R1p21

Tests Pass:
13 tests, 13 assertions, 0 failures
I couldn't get it to build to test the text displaying in browser, so
that still needs to be tested.
 2013-02-17 15:10:21 -05:00
Peter Cottle
09da420df0 Fixes Issue #26 2013-02-17 10:19:13 -08:00
Peter Cottle
84a9adea01 fixes Issue #22 2013-02-17 03:34:34 -08:00
Peter Cottle
b0f19e91e4 Merge pull request #21 from lkysow/bugfix/typo-in-intro-5 
Fix incorrect commit number in intro 5
 2013-02-17 03:27:05 -08:00
Tobias Pfeiffer
86a7b99324 Update src/levels/intro/1.js 
Fixed a little typo (the all the files)
 2013-02-17 10:03:44 +01:00
Luke Kysow
e7b8293c69 Fix incorrect commit number in intro 5 2013-02-17 00:41:55 -08:00
Shao-Chung Chen
d3ab5a1a7d fix an typo in mixed-2 2013-02-17 14:08:00 +08:00
Shao-Chung Chen
6bf593b787 fix a typo in rebase1 2013-02-17 12:51:57 +08:00
Peter Cottle
0ca8f79880 Fixes Issue #15 thanks @caspark! 2013-02-16 20:41:20 -08:00
Peter Cottle
797f8b0c55 Rewrite of intro dialog, thanks @Cogito Issue #13 2013-02-16 19:16:23 -08:00
Peter Cottle
9c7e5707f0 Fixes Issue #8 2013-02-16 17:35:04 -08:00
Peter Cottle
c580c34cdf Fixes Issue #10 2013-02-16 17:26:55 -08:00
Peter Cottle
a2bf42461d less talking 2013-02-16 16:38:36 -08:00
Peter Cottle
00506aa332 remove skeuo 2013-02-16 16:29:17 -08:00
Peter Cottle
aa5fd916af fixes button thing 2013-02-16 16:24:30 -08:00
Peter Cottle
bd68e9ddf3 Fixes Issue #3 2013-02-16 16:20:36 -08:00
Peter Cottle
19792440f8 Fixes Issue #7 2013-02-16 15:35:08 -08:00
Peter Cottle
168852b293 resolves Issue 6 2013-02-16 15:28:59 -08:00
Peter Cottle
36d3ea31fc Fixes Issue #4 2013-02-16 14:53:35 -08:00
Peter Cottle
a97e575f63 Fixes Issue #4 2013-02-16 13:27:40 -08:00
Peter Cottle
81c1d2402a Fixes Issue #4 2013-02-16 13:15:38 -08:00
Peter Cottle
1ad1ba24d2 hn rage 2013-02-16 13:07:04 -08:00
Peter Cottle
35e8d98bd5 hn rage 2013-02-16 12:58:49 -08:00
Peter Cottle
e1f022cc55 hn rage 2013-02-16 12:56:12 -08:00
Peter Cottle
e18b2cf2bf hn rage 2013-02-16 12:55:03 -08:00
Peter Cottle
e54b301007 hn crap 2013-02-16 12:51:09 -08:00
Peter Cottle
e0bdf54d96 going ot bed 2013-01-21 21:49:43 -08:00
Peter Cottle
ab5a752691 stuff 2013-01-21 20:31:04 -08:00
Peter Cottle
576823dbfd template 2013-01-21 18:15:28 -08:00
Peter Cottle
f02d5983d6 weird markdown bug 2013-01-21 00:46:01 -08:00
Peter Cottle
d9050fd854 Sweet, fixed tests 2013-01-20 23:42:23 -08:00
Peter Cottle
b8e7d2a874 ok 2013-01-16 15:24:09 -08:00
Peter Cottle
f7e5e5ac71 ok with grunt 2013-01-16 15:18:17 -08:00
Peter Cottle
095c17218d damnit text nodes wtf 2013-01-16 15:02:23 -08:00
Peter Cottle
88f5c2d2b3 woo command now working too 2013-01-13 11:32:45 -08:00
Peter Cottle
24139d8ec5 improt random levle 2013-01-13 11:27:23 -08:00
Peter Cottle
45aa088796 import export tree done 2013-01-13 11:09:21 -08:00
Peter Cottle
4c837f7d92 ok demo nice 2013-01-12 23:26:59 -08:00
Peter Cottle
22605249ce new demo command 2013-01-12 23:15:13 -08:00
Peter Cottle
0cb6e43549 new levelll 2013-01-12 23:07:14 -08:00
Peter Cottle
98400dd88f rebase! woo 2013-01-12 22:58:23 -08:00