urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-17 23:32:56 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,924 Commits 768 Branches 10 Tags 215 MiB
36246ab4b0
Commit Graph

1924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raymond Pasco
36246ab4b0 Merge branch 'chc4-usage' into test 2015-10-07 05:50:22 -04:00
chc4
f265f80ab3 Update usage 
I didn't list most of the ones that I never heard about before (-r, -l, -b)
 2015-10-07 00:39:38 -04:00
Philip C Monk
337b93e8f9 Merge remote-tracking branch 'galen/test' into pending 2015-10-05 20:14:42 -04:00
Galen Wolfe-Pauly
3b11bc7e62 Merge branch 'test' of github.com:urbit/urbit into test 2015-10-05 16:13:17 -07:00
Galen Wolfe-Pauly
d0d6643fa6 minor 2015-10-05 14:35:16 -07:00
Philip C Monk
6bfd064670 Merge branch 'master' into test 2015-10-05 17:09:03 -04:00
Philip C Monk
ee91507f15 Merge remote-tracking branch 'origin/master' 2015-10-05 17:08:09 -04:00
Galen Wolfe-Pauly
2317064e74 mount instructions 2015-10-05 14:01:41 -07:00
Galen Wolfe-Pauly
cb665f41c9 Merge branch 'test' of github.com:galenwp/urbit into test 2015-10-02 17:42:56 -07:00
Galen Wolfe-Pauly
f61925009f Merge branch 'test' of github.com:urbit/urbit into test 2015-10-02 14:49:20 -07:00
Philip C Monk
5d5dd1326a Merge branch 'master' into test 2015-10-02 16:37:58 -04:00
Anton Dyudin
b9fd85fe39 Merge branch 'master' of https://github.com/urbit/urbit into nobreach 2015-10-02 13:10:28 -07:00
Philip C Monk
fcd92bd626 Merge branch 'master' into test 2015-10-01 18:27:55 -04:00
Philip C Monk
9aa6aa9554 Merge remote-tracking branch 'galen/test' into pending 2015-10-01 18:06:52 -04:00
Philip C Monk
042709249d Merge remote-tracking branch 'origin/master' into pending 2015-10-01 18:04:08 -04:00
Raymond Pasco
567f6d067f Merge remote-tracking branch 'juped/pier-exists-check' into test 2015-10-01 13:24:27 -04:00
Raymond Pasco
829d65b40a Check if directory already exists when using -c 2015-10-01 13:23:29 -04:00
Raymond Pasco
cf68ac20ab Merge branch 'max19-newfp' into test 2015-09-30 18:14:46 -04:00
Max G
d8c148703a mpz_clears to mpz_clear 2015-09-30 16:53:32 +03:00
Galen Wolfe-Pauly
74ed5cc46c Merge branch 'test' of github.com:galenwp/urbit into test 2015-09-29 17:22:15 -07:00
Galen Wolfe-Pauly
21d2344a1c Merge branch 'test' of github.com:urbit/urbit into test 2015-09-29 17:18:25 -07:00
Anton Dyudin
52c27c7f87 Merge branch 'master' of https://github.com/urbit/urbit into nobreach 2015-09-29 12:16:37 -07:00
Raymond Pasco
48865ce5f9 Merge remote-tracking branch 'burtonsamograd/ignore-emacs-temp-files' into test 2015-09-28 21:23:50 -04:00
Burton Samograd
f870a09d9d Tabs -> spaces. 2015-09-28 19:10:22 -06:00
Burton Samograd
56b0892ba9 Ignore #file#, which are emacs temp work files. 2015-09-28 19:07:28 -06:00
Raymond Pasco
171fe5a3c9 Merge remote-tracking branch 'chc4/ticket' into test 2015-09-27 19:35:02 -04:00
Charlie Cummings
2f2144e8c5 Ask for ticket, close #366 2015-09-27 19:07:26 -04:00
Raymond Pasco
50c8fafbc5 Revert big green merge button 
This reverts commit 963439d53028fbe0d22ba1fb37713dd0a3fbb9f4, reversing
changes made to 4aa4d31472574da31d39af022eff4382973ba683.
 2015-09-26 18:06:30 -04:00
Raymond Pasco
48bbde3647 Backport big green merge button fallout to test 2015-09-26 18:05:02 -04:00
cgyarvin
f31b460052 Merge pull request #413 from burtonsamograd/thread-nock-interpreter 
Thread the nock interpreter using computed gotos.
 2015-09-26 13:03:41 -07:00
Burton Samograd
31ff27f426 Bound check for bad nocks. 2015-09-26 13:18:15 -06:00
Burton Samograd
32da1b5f1a Thread the nock interpreter using computed gotos. 2015-09-25 23:38:52 -06:00
Philip C Monk
c75469040f Merge branch 'master' into test 2015-09-25 18:57:50 -04:00
Raymond Pasco
75e722e6d3 Merge remote-tracking branch 'daveloyall/patch-1' into test 2015-09-25 18:55:55 -04:00
Dave Loyall
f91e79d173 Remove bitrotten make target. 2015-09-25 17:54:50 -05:00
C. Guy Yarvin
19fb25de7f Merge branch 'master' of https://github.com/urbit/urbit 2015-09-24 16:34:17 -07:00
C. Guy Yarvin
ba11c0279d More ambiguous. 2015-09-24 16:34:01 -07:00
Philip C Monk
263fef4396 Merge branch 'bvschwartz-patch-1', remote-tracking branch 'anton/nobreach' into pending 2015-09-23 20:38:42 -04:00
Anton Dyudin
8e86d0a25a Merge remote-tracking branch 'urbit/master' into nobreach 2015-09-23 16:57:31 -07:00
Philip C Monk
ea2ef58f4e Merge remote-tracking branch 'anton/nobreach' into pending 2015-09-23 19:56:55 -04:00
Philip C Monk
8570983b63 Merge remote-tracking branch 'anton/nobreach' into pending 2015-09-23 19:41:14 -04:00
Philip C Monk
183700064d Merge remote-tracking branch 'anton/nobreach' into pending 2015-09-23 19:34:56 -04:00
Philip C Monk
54bdfd5d12 Merge remote-tracking branch 'anton/nobreach' into pending 2015-09-23 19:11:15 -04:00
Philip C Monk
9a3af59026 Merge remote-tracking branch 'anton/nobreach' into pending 2015-09-23 17:38:48 -04:00
Anton Dyudin
ee20e5670b Merge remote-tracking branch 'glen/test' into nobreach 2015-09-23 14:25:54 -07:00
C. Guy Yarvin
b9517c23b1 More negative. 2015-09-22 14:04:11 -07:00
Philip C Monk
6a4188db3a Merge remote-tracking branches 'anton/nobreach' and 'my/clayhammer' into test 
Conflicts:
	urb/urbit.pill
 2015-09-21 14:58:10 -04:00
Raymond Pasco
d3a475e800 Merge remote-tracking branch 'gunga/skid-jet' into test 2015-09-19 15:41:37 -04:00
Joan Torres
012dabaf6a Add ++skid jet 2015-09-19 10:03:13 -07:00
Philip C Monk
696a20505f Merge remote-tracking branch 'my/pending' into test 2015-09-17 16:55:57 -04:00