cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,977 Commits 1 Branch 0 Tags 6.6 MiB
Commit Graph

1977 Commits

Author SHA1 Message Date
Joey Hess fc95968145
propellor spin 2014-09-18 23:50:13 -04:00
Joey Hess f0409ae869 disable unattended upgrades for autobuilders that mix dpkg and cabal 
upgrades of dpkg haskell libs can break cabal ones
 2014-09-13 14:17:19 -04:00
Joey Hess acd4638493
propellor spin 2014-09-10 23:01:19 -04:00
Joey Hess d8367de73a
propellor spin 2014-09-10 22:56:42 -04:00
Joey Hess 239f841a6f
propellor spin 2014-09-10 15:43:32 -04:00
Joey Hess 8313438986
propellor spin 2014-09-09 15:21:47 -04:00
Joey Hess eacc7abcee
propellor spin 2014-09-09 13:58:01 -04:00
Joey Hess d01b54ede9
propellor spin 2014-09-09 13:51:04 -04:00
Joey Hess 203f597794
propellor spin 2014-09-09 13:39:24 -04:00
Joey Hess a372e7a2f2 transitioned! 2014-09-08 16:53:47 -04:00
Joey Hess 599168ddcb
propellor spin 2014-09-08 15:20:53 -04:00
Joey Hess f2bdab547e
propellor spin 2014-09-08 15:18:42 -04:00
Joey Hess 7f1121a42e
propellor spin 2014-09-08 14:58:34 -04:00
Joey Hess 71b2bfcdb4
propellor spin 2014-09-08 14:48:42 -04:00
Joey Hess 8ec05b4d8b
propellor spin 2014-09-08 14:44:34 -04:00
Joey Hess 0126c41a53
propellor spin 2014-09-08 12:46:54 -04:00
Joey Hess b5977a735d
propellor spin 2014-09-08 11:56:35 -04:00
Joey Hess 265e744edb
propellor spin 2014-09-08 11:55:48 -04:00
Joey Hess 9376041535
propellor spin 2014-09-08 11:15:05 -04:00
Joey Hess a1741fad00
propellor spin 2014-09-08 11:12:54 -04:00
Joey Hess b21feb9e8d
propellor spin 2014-09-08 10:56:08 -04:00
Joey Hess d968da96f3
propellor spin 2014-08-29 16:24:16 -07:00
Joey Hess 7499ab41a5
propellor spin 2014-08-29 16:22:51 -07:00
Joey Hess bdbbee21f8
propellor spin 2014-08-29 16:21:57 -07:00
Joey Hess 859c0c8017
propellor spin 2014-08-29 16:19:30 -07:00
Joey Hess 0c0c9d9a7f
propellor spin 2014-08-29 16:17:28 -07:00
Joey Hess 0af697a649
propellor spin 2014-08-29 16:14:09 -07:00
Joey Hess 4c7f8bc8a3
propellor spin 2014-08-29 16:09:12 -07:00
Joey Hess 69873e484e
propellor spin 2014-08-29 16:07:18 -07:00
Joey Hess 4c1c41d1a2 reorg 2014-08-29 10:30:48 -07:00
Joey Hess 70e1df98c5
propellor spin 2014-08-29 09:34:45 -07:00
Joey Hess 4a244b04c0
propellor spin 2014-08-29 09:33:24 -07:00
Joey Hess 7ff8d0f8a2 prep release 2014-08-22 13:02:18 -04:00
Joey Hess 3cb9a60f89
propellor spin 2014-08-21 15:52:49 -04:00
Joey Hess 0929cad092 comments 2014-08-21 14:12:23 -04:00
Joey Hess 3822c9a2d7
propellor spin 2014-08-21 14:04:26 -04:00
Joey Hess ceb56ac32b keep warning of out of date after updating upstream/master, until it gets merged 2014-08-19 19:22:54 -04:00
Joey Hess 81544b37a8 fix man page installation 2014-08-19 19:06:21 -04:00
Joey Hess db1cf96dd7 remove origin remote after local clone 
It's not useful, since it'll change to something that cannot be directly
merged with.
 2014-08-19 19:03:05 -04:00
Joey Hess 11c1160655 reorg manpage 2014-08-19 18:06:00 -04:00
Joey Hess d6320b8130 -X 2014-08-19 17:59:15 -04:00
Joey Hess 5d92ed6ea7 need to -s theirs or the merge is likely to fail 2014-08-19 17:57:32 -04:00
Joey Hess d289a222d5 simpler merge 
Ah, we've checked out the oldref, so can just merge the newref in and get a
branch that is suitable for mergeing into the user's repo. No need for
manual diff, which can fail on eg, binaries or no changes.
 2014-08-19 17:54:49 -04:00
Joey Hess adf8b2ec34 need to connect up history 2014-08-19 17:51:34 -04:00
Joey Hess 6f8f0c1c6b beargN 2014-08-19 17:34:25 -04:00
Joey Hess 7a34a1efbf merge from master 2014-08-19 17:33:00 -04:00
Joey Hess 215a8e7f0e merge from master 2014-08-19 17:31:09 -04:00
Joey Hess 4766442124 bleargh45678etc 2014-08-19 17:30:10 -04:00
Joey Hess 5365334ac2 double bleargh 2014-08-19 17:24:13 -04:00
Joey Hess d366e5e525 bleargh 2014-08-19 17:22:14 -04:00