summaryrefslogtreecommitdiff
path: root/src/wrapper.hs
AgeCommit message (Collapse)Author
2015-03-22simplify setup process for minimal config modeJoey Hess
Allow cloning a branch. Updated wrapper to check for propellor.cabal and not try to update if it's not present, to handle this case.
2015-02-28Propellor now builds itself without needing the Makefile.Joey Hess
2014-08-19keep warning of out of date after updating upstream/master, until it gets mergedJoey Hess
2014-08-19remove origin remote after local cloneJoey Hess
It's not useful, since it'll change to something that cannot be directly merged with.
2014-08-19-XJoey Hess
2014-08-19need to -s theirs or the merge is likely to failJoey Hess
2014-08-19simpler mergeJoey Hess
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-19need to connect up historyJoey Hess
2014-08-19syntaxJoey Hess
2014-08-19syntaxJoey Hess
2014-08-19color messageJoey Hess
2014-08-19fixesJoey Hess
2014-08-19fix ref nameJoey Hess
2014-08-19head file will end with a newlineJoey Hess
2014-08-19ugly workaround for lack of history in repo distributed with debian packageJoey Hess
2014-08-19final fixesJoey Hess
2014-08-19warningsJoey Hess
2014-08-19debian upgrade handlingJoey Hess
The /usr/bin/propellor wrapper will warn when ~/.propellor/ is out of date and a newer version is available from origin.
2014-08-19typoJoey Hess
2014-08-19stop removing privdata, it's no longer in masterJoey Hess
2014-08-19local repo fully working nowJoey Hess
2014-08-19The Debian package now includes a single-revision git repository in ↵Joey Hess
/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-06-09cleanupJoey Hess
2014-05-14moved source code to srcJoey Hess
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.