summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-08-21propellor spinJoey Hess
2014-08-19keep warning of out of date after updating upstream/master, until it gets mergedJoey Hess
2014-08-19fix man page installationJoey 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-19reorg manpageJoey Hess
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-19beargNJoey Hess
2014-08-19merge from masterJoey Hess
2014-08-19merge from masterJoey Hess
2014-08-19bleargh45678etcJoey Hess
2014-08-19double blearghJoey Hess
2014-08-19blearghJoey Hess
2014-08-19oh, can't use cabal sdist --list-sourcesJoey Hess
Doesn't work when using ./Setup as cabal
2014-08-19syntaxJoey Hess
2014-08-19syntaxJoey Hess
2014-08-19oops, can't rely on a git repo when building debian package..Joey Hess
2014-08-19color messageJoey Hess
2014-08-19fixesJoey Hess
2014-08-19prep releaseJoey Hess
2014-08-19fixJoey Hess
2014-08-19fixJoey Hess
2014-08-19use git archive, rather than cabal sdist for making single-commit git repoJoey Hess
This makes the symlinks be preserved, which it seems cabal does not do.
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-19typoJoey 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-08-19upgrade noteJoey Hess
2014-08-19Included the config.hs symlink to config-simple.hs in the cabal and Debian ↵Joey Hess
packages.
2014-08-19updateJoey Hess
2014-08-13propellor spinJoey Hess
2014-08-13propellor spinJoey Hess
2014-08-04prep releaseJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-23changelogJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-23propellor spinJoey Hess
2014-07-23propellor spinJoey Hess
generated by cgit v1.3-2-g0d8e (git 2.53.0) at 2026-06-17 13:35:11 +0000