599168ddcb
propellor spin
2014-09-08 15:20:53 -04:00
f2bdab547e
propellor spin
2014-09-08 15:18:42 -04:00
0126c41a53
propellor spin
2014-09-08 12:46:54 -04:00
b21feb9e8d
propellor spin
2014-09-08 10:56:08 -04:00
3cb9a60f89
propellor spin
2014-08-21 15:52:49 -04:00
3822c9a2d7
propellor spin
2014-08-21 14:04:26 -04:00
ceb56ac32b
keep warning of out of date after updating upstream/master, until it gets merged
2014-08-19 19:22:54 -04:00
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
d6320b8130
-X
2014-08-19 17:59:15 -04:00
5d92ed6ea7
need to -s theirs or the merge is likely to fail
2014-08-19 17:57:32 -04:00
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
adf8b2ec34
need to connect up history
2014-08-19 17:51:34 -04:00
1bf736293d
syntax
2014-08-19 17:17:36 -04:00
7743da0c3d
syntax
2014-08-19 17:17:01 -04:00
d54ee6c336
color message
2014-08-19 17:12:57 -04:00
f72a1aa690
fixes
2014-08-19 17:09:11 -04:00
1ada0f1014
fix ref name
2014-08-19 16:47:00 -04:00
4ae9578e36
head file will end with a newline
2014-08-19 16:44:51 -04:00
3c61c109fb
ugly workaround for lack of history in repo distributed with debian package
2014-08-19 16:40:04 -04:00
e0bbb776bf
final fixes
2014-08-19 15:29:32 -04:00
8e45b0f77b
warnings
2014-08-19 15:23:29 -04:00
1830f501ee
debian upgrade handling
...
The /usr/bin/propellor wrapper will warn when ~/.propellor/ is out of date
and a newer version is available from origin.
2014-08-19 15:22:42 -04:00
527ae1dc20
typo
2014-08-19 15:06:06 -04:00
71ccd256da
stop removing privdata, it's no longer in master
2014-08-19 15:04:12 -04:00
7d59dee469
local repo fully working now
2014-08-19 15:02:12 -04:00
b6c5f54741
The Debian package now includes a single-revision git repository in /usr/src/propellor/, and ~/.propellor/ is set up to use this repository as its "upstream" remote. This avoids relying on the security of the github repository when using the Debian package.
2014-08-19 14:35:38 -04:00
08a3c52017
propellor spin
2014-07-23 12:48:46 -04:00
ac46ab4d0c
propellor spin
2014-07-23 12:33:44 -04:00
3d617fd98b
propellor spin
2014-07-23 12:33:11 -04:00
41a23743e7
propellor spin
2014-07-23 12:27:38 -04:00
dd32a63a07
propellor spin
2014-07-23 12:25:38 -04:00
ecc275cfeb
propellor spin
2014-07-23 12:23:44 -04:00
7d3c09df5f
propellor spin
2014-07-23 11:52:46 -04:00
78bbd860c6
propellor spin
2014-07-23 10:54:21 -04:00
321a0bdef6
propellor spin
2014-07-23 10:52:26 -04:00
660f77c28f
propellor spin
2014-07-22 16:40:11 -04:00
ed83966460
propellor spin
2014-07-22 16:29:22 -04:00
dc1a8db064
propellor spin
2014-07-22 16:28:04 -04:00
e01fc46ba3
propellor spin
2014-07-22 16:21:54 -04:00
400422a7e6
propellor spin
2014-07-22 15:27:44 -04:00
98a3114763
propellor spin
2014-07-22 15:25:07 -04:00
7028c2c9cc
propellor spin
2014-07-18 16:45:40 -04:00
51edffe173
propellor spin
2014-07-18 16:43:11 -04:00
93730d530a
propellor spin
2014-07-18 16:40:09 -04:00
d5abbeb116
propellor spin
2014-07-18 15:59:17 -04:00
fd7d6907b8
propellor spin
2014-07-18 15:58:05 -04:00
ef472be6a6
propellor spin
2014-07-18 14:42:46 -04:00
90682a7984
propellor spin
2014-07-18 14:36:51 -04:00
0d188bf5f6
propellor spin
2014-07-18 14:33:30 -04:00
4d38e8bfd6
propellor spin
2014-07-18 13:09:55 -04:00
Joey Hess