summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-09-18propellor spinJoey Hess
2014-09-13disable unattended upgrades for autobuilders that mix dpkg and cabalJoey Hess
upgrades of dpkg haskell libs can break cabal ones
2014-09-10propellor spinJoey Hess
2014-09-10propellor spinJoey Hess
2014-09-10propellor spinJoey Hess
2014-09-09propellor spinJoey Hess
2014-09-09propellor spinJoey Hess
2014-09-09propellor spinJoey Hess
2014-09-09propellor spinJoey Hess
2014-09-08transitioned!Joey Hess
2014-09-08propellor spinJoey Hess
2014-09-08propellor spinJoey Hess
2014-09-08propellor spinJoey Hess
2014-09-08propellor spinJoey Hess
2014-09-08propellor spinJoey Hess
2014-09-08propellor spinJoey Hess
2014-09-08propellor spinJoey Hess
2014-09-08propellor spinJoey Hess
2014-09-08propellor spinJoey Hess
2014-09-08propellor spinJoey Hess
2014-09-08propellor spinJoey Hess
2014-08-29propellor spinJoey Hess
2014-08-29propellor spinJoey Hess
2014-08-29propellor spinJoey Hess
2014-08-29propellor spinJoey Hess
2014-08-29propellor spinJoey Hess
2014-08-29propellor spinJoey Hess
2014-08-29propellor spinJoey Hess
2014-08-29propellor spinJoey Hess
2014-08-29reorgJoey Hess
2014-08-29propellor spinJoey Hess
2014-08-29propellor spinJoey Hess
2014-08-22prep releaseJoey Hess
2014-08-21propellor spinJoey Hess
2014-08-21commentsJoey Hess
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