Commit graph

484 commits

Author SHA1 Message Date
Peter Cottle
1a3f21175a Awesome tabs working for the levels 2013-10-10 19:20:14 -07:00
Peter Cottle
db78bad106 Fix --no-ff for real usage, Pull Request #136 clowntown by me thanks @nem75 2013-10-10 14:30:55 -07:00
Peter Cottle
f930bae005 Support for push refspecs with colon, aka master:master or :foo 2013-10-09 22:29:05 -07:00
Peter Cottle
b2321dd265 Resolves #132 -- checking out remote branches sets tracking 2013-10-09 21:28:40 -07:00
Peter Cottle
c2cab4c12a Resolves #133 content for first lesson slide 2013-10-09 21:18:25 -07:00
Peter Cottle
6769634217 Issue #128 Preserve Merges for rebase 2013-10-09 21:10:29 -07:00
Peter Cottle
eb3c8f031a rebuild for Pull Request #136 2013-10-09 14:27:09 -07:00
Peter Cottle
b13d6946e9 comparison settings 2013-10-08 12:56:17 -07:00
Peter Cottle
f963c4ea0a nother level 2013-10-08 12:30:00 -07:00
Peter Cottle
302e131189 advanced levels 2013-10-08 11:25:25 -07:00
Peter Cottle
fa7b918be9 more levels 2013-10-07 21:21:18 -07:00
Peter Cottle
541ae67fbd fixed tests 2013-10-07 16:54:54 -07:00
Peter Cottle
9e3b9cd911 another level 2013-10-07 15:12:16 -07:00
Peter Cottle
fe551e4df4 ugh rerecorded all tests after changing tree saving and loading behavior 2013-10-07 13:53:01 -07:00
Peter Cottle
241a2dcd1c level content work 2013-10-07 12:50:05 -07:00
Peter Cottle
a7a07e9f92 new remote branch level 2013-10-07 12:42:04 -07:00
Peter Cottle
bfd8483d90 Issue #129 pushing to different remote branches 2013-10-07 11:29:08 -07:00
Peter Cottle
7034eb76fa Issue #131 awesomely now respect remote tracking branch info for git pull 2013-10-06 23:52:33 -07:00
Peter Cottle
79d65e739a Issue #130 -- slightly odd rebase animation fixed 2013-10-06 22:48:04 -07:00
Peter Cottle
73660f7126 Issue #130 -- hangs after pull uncaught result 2013-10-06 22:34:51 -07:00
Peter Cottle
9fa8c1383d yay got multiple remotes fetching working 2013-10-06 18:09:38 -07:00
Peter Cottle
a16204fea3 rebuild for content on lesson 1 2013-10-06 17:17:26 -07:00
Peter Cottle
00a843754e rebuild for fb page post 2013-10-06 17:02:12 -07:00
Peter Cottle
0c95e975ec YES AWESOME got make origin working with headless somehow in crazy 2013-10-06 16:33:30 -07:00
Peter Cottle
dd64536615 ugh ugly bug again with origin loading so sad 2013-10-06 16:13:40 -07:00
Peter Cottle
11074dba64 ugly bug around unescaping 2013-10-06 15:49:59 -07:00
Peter Cottle
bbf837a4b2 ugly ugly bug with circular fields 2013-10-06 15:12:21 -07:00
Peter Cottle
1ed8a2524a misc work 2013-10-06 14:30:50 -07:00
Peter Cottle
906216d98b ugh annoying teardown bug 2013-10-06 13:16:30 -07:00
Peter Cottle
33e5060ac7 better highlighting with keyboard events for level dropdown view 2013-10-06 11:49:18 -07:00
Peter Cottle
9e24c2dfa2 Issue #109 Elaborate more on relative refs number 2 level 2013-10-06 11:41:32 -07:00
Peter Cottle
b19a1e2bc5 Issue #127 Ridiculously silly typo 2013-10-06 11:29:59 -07:00
Peter Cottle
2f9437cbb2 Issue #126 remove usage of upstream and downstream 2013-09-27 20:39:32 -07:00
Peter Cottle
cfea67ecce fixes remote branch grabbing 2013-09-09 12:15:46 -07:00
Peter Cottle
6291baf665 refreshing prod since glone si broken there 2013-09-09 11:42:57 -07:00
Peter Cottle
3ff56c002c color animation 2013-09-01 12:24:20 -07:00
Peter Cottle
9840a5e6b4 correctness on fetch 2013-09-01 12:16:46 -07:00
Peter Cottle
7cec1bcaab now multi origin fetch works 2013-09-01 11:55:28 -07:00
Peter Cottle
d6c89f913f Issue #123 2013-08-22 19:49:44 -07:00
Peter Cottle
fc502bcdaf rebuild for Issue #121 Pull #121 2013-08-05 20:43:10 -07:00
Peter Cottle
4815a6f30b WIP 2013-08-05 20:41:44 -07:00
Peter Cottle
d75489c175 making sandbox first class 2013-08-04 15:09:11 -07:00
Peter Cottle
bf132f8f09 mercurial test coverage 2013-08-04 13:27:33 -07:00
Peter Cottle
fbb0da00f4 new delays 2013-08-02 23:56:29 -07:00
Peter Cottle
9e88510dc7 rename branches for hackathon demo 2013-08-01 13:04:41 -07:00
Peter Cottle
e7709223c3 before prototype forum 2013-08-01 12:19:58 -07:00
Peter Cottle
3246649cb6 now with hgdemo2 2013-08-01 11:21:25 -07:00
Peter Cottle
8e128020d7 hg demo starting 2013-08-01 10:43:27 -07:00
Peter Cottle
24b4fcd1cd importTreeNow command 2013-08-01 10:00:37 -07:00
Peter Cottle
d52830f3d2 rebuild fix 2013-08-01 00:27:08 -07:00