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
416a6646c3
cleanup
2014-06-09 12:34:32 -04:00
7115d1ec16
moved source code to src
...
This is to work around OSX's brain-damange regarding filename case
insensitivity.
Avoided moving config.hs, because it's a config file. Put in a symlink to
make build work.
2014-05-14 19:41:05 -04:00
Joey Hess