mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-14 08:34:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
2879 commits 7 branches 0 tags 104 MiB
Commit graph

2879 commits

This branch
This branch
All branches
Author SHA1 Message Date
Peter Cottle
6c487cc053 WIP everything is horribly broken testa bunch before pushing but something in git is messed up if you do get tree quick who knows 2013-07-07 23:29:28 -07:00
Peter Cottle
d2e418641f demonstration view fix WIP 2013-07-07 23:24:11 -07:00
Peter Cottle
e6942446df headless wip 2013-07-07 22:10:12 -07:00
Peter Cottle
b7fb355b97 awesome faded branches for level comparing done 2013-07-07 21:01:21 -07:00
Peter Cottle
e7f5acaece awesome faded branches for level comparing done 2013-07-07 21:01:06 -07:00
Peter Cottle
19f204ddcb visuals down for non essential branches 2013-07-07 20:44:46 -07:00
Peter Cottle
264f245275 WIP on legend for goal 2013-07-07 15:26:03 -07:00
Peter Cottle
ea30b42616 Tests all greengs! woooo 2013-07-07 14:10:57 -07:00
Peter Cottle
afebc47c4a Fixed a bunch of the async tests, porting over to git spec 2013-07-07 14:07:17 -07:00
Peter Cottle
67570f716d fixed merge case with existing commits 2013-07-07 14:06:25 -07:00
Peter Cottle
87c787c8af before test fix 2013-07-07 12:43:02 -07:00
Peter Cottle
f682f42aa0 starting on push bug for git merge C3;git merge master;go master;git merge side;git push;gc; git reset HEAD~1; git clone; gc; git merge C2; git push; 2013-07-05 09:58:57 -07:00
Peter Cottle
cb54364d6a todo 2013-07-04 18:10:30 -07:00
Peter Cottle
e382004a55 Removed one TODO -- better cloning of all branches, origin/master setup automatically, and fake teamwork anywhere 2013-07-04 18:09:53 -07:00
Peter Cottle
11a3062797 Rebuild for Issue #114 Pull #116 2013-07-04 17:46:31 -07:00
Peter Cottle
a22f033807 Merge pull request #116 from nkouevda/master 
Remove case insensitive refs check
 2013-07-04 17:44:45 -07:00
Nikita Kouevda
fc24f3c145 Remove case insensitive refs check. 2013-07-04 17:41:30 -07:00
Peter Cottle
92e2e303ed [Origin] Fixed pull command throwing too early during no fetch case 2013-07-04 17:27:03 -07:00
Peter Cottle
63a88a6885 Rebuild for awesome translation work by Joël Thieffry Pull #113 Issue #113 2013-06-29 09:54:03 -07:00
Peter Cottle
59bafd2e28 Merge pull request #113 from Nioub/frenchTranslation 
translated all fr_FR except in levels
 2013-06-29 09:53:01 -07:00
Joël Thieffry
27ccab4dec translated all fr_FR except in levels 2013-06-29 18:16:25 +02:00
Peter Cottle
62317b8d4c Root commit regression Issue #100 2013-06-29 00:22:41 -07:00
Peter Cottle
fad9661f30 fixed git push target graph difference method bug 2013-06-27 18:47:39 -07:00
Peter Cottle
c98f979885 Add noscript Issue #107 2013-06-26 18:15:38 -07:00
Peter Cottle
c974ffed8e bit of remote work2 2013-06-24 08:59:06 -07:00
Peter Cottle
af632eaa5e bit of remote work 2013-06-24 08:59:02 -07:00
Peter Cottle
8a4f8baafb todo stuff for remote tracking 2013-06-17 21:01:51 -07:00
Peter Cottle
e99dce8948 Issue 106 exit button on first slide 2013-06-15 21:57:02 -07:00
Peter Cottle
31ad2a586b Issue #105 making objective more discoverable 2013-06-15 20:59:47 -07:00
Peter Cottle
3b8649c891 todo 2013-06-11 21:00:53 -07:00
Peter Cottle
73f7e2638b build for pull --rebase 2013-06-11 20:55:50 -07:00
Peter Cottle
aed8ce29f3 real pull --rebase fixed 2013-06-11 20:52:34 -07:00
Peter Cottle
bbfb4d7512 git pull --rebase now done 2013-06-11 20:41:43 -07:00
Peter Cottle
69e6cc0472 readme names for Issue #104 2013-06-11 10:30:51 -07:00
Peter Cottle
7b68e0da73 whoops broke all levels Issue #104 2013-06-11 10:03:11 -07:00
Peter Cottle
c7da989845 awesome have part of git push working 2013-06-11 09:28:14 -07:00
Peter Cottle
84f180e6a8 taking a break 2013-06-10 21:52:18 -07:00
Peter Cottle
3458cc17af awesome new pull animation 2013-06-10 21:30:54 -07:00
Peter Cottle
d80ae31adc awesome pull animation now 2013-06-10 21:09:09 -07:00
Peter Cottle
b090cef461 awesome, git fetch working super well 2013-06-10 20:21:50 -07:00
Peter Cottle
d18633c608 WUT could it be that easy? awesome 2013-06-10 20:01:49 -07:00
Peter Cottle
30fe255c88 Fireefox style fix 2013-06-10 09:57:32 -07:00
Peter Cottle
6cc0b182cc WIP working on get target graph difference 2013-06-08 22:40:46 -07:00
Peter Cottle
6e75e04daf awesome tree compare coverage for tests, no bugs found though 2013-06-08 15:57:33 -10:00
Peter Cottle
1a846bbad3 final tree compare test coverage, yayness 2013-06-08 15:53:51 -10:00
Peter Cottle
f8fec430be awesome more test coverage 2013-06-08 14:55:00 -10:00
Peter Cottle
3d8e40851e working on tree compare tests etc 2013-06-08 14:11:13 -10:00
Peter Cottle
89fa08e149 tree compare refactored 2013-06-08 12:37:44 -10:00
Peter Cottle
89377b2956 working on headless, some tests fail because promise does not resolve or execute 2013-06-06 08:54:42 -10:00
Peter Cottle
d0e206bcc4 before headless fix, but not animation factory is static class 2013-06-05 18:48:59 -10:00