summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-08-29Added a comment: Is it ok to publish to a public repository?https://www.google.com/accounts/o8/id?id=AItOawmtnXa0F3OsNh8H7yf5EEbtuufPZG-3StI
2014-08-23debCdn switched from cdn.debian.net to http.debian.net, which seems to be ↵Joey Hess
better managed now.
2014-08-22add news item for propellor 0.8.3Joey Hess
2014-08-22Merge branch 'joeyconfig'Joey Hess
2014-08-22prep releaseJoey Hess
2014-08-22Merge branch 'joeyconfig'Joey Hess
2014-08-21propellor spinJoey Hess
2014-08-21commentsJoey Hess
2014-08-21propellor spinJoey Hess
2014-08-19Merge branch 'joeyconfig'Joey Hess
2014-08-19keep warning of out of date after updating upstream/master, until it gets mergedJoey Hess
2014-08-19Merge branch 'joeyconfig'Joey Hess
2014-08-19fix man page installationJoey Hess
2014-08-19Merge branch 'joeyconfig'Joey 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-19Merge branch 'joeyconfig'Joey Hess
2014-08-19-XJoey Hess
2014-08-19Merge branch 'joeyconfig'Joey Hess
2014-08-19need to -s theirs or the merge is likely to failJoey Hess
2014-08-19Merge branch 'joeyconfig'Joey 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-19Merge branch 'joeyconfig'Joey Hess
2014-08-19need to connect up historyJoey Hess
2014-08-19Merge branch 'joeyconfig'Joey Hess
2014-08-19beargNJoey Hess
2014-08-19Merge branch 'joeyconfig'Joey Hess
2014-08-19merge from masterJoey Hess
2014-08-19Merge branch 'joeyconfig'Joey Hess
2014-08-19merge from masterJoey Hess
2014-08-19Merge branch 'joeyconfig'Joey Hess
Conflicts: Makefile
2014-08-19bleargh45678etcJoey Hess
2014-08-19bleargh3Joey Hess
2014-08-19Merge branch 'joeyconfig'Joey Hess
2014-08-19double blearghJoey Hess
2014-08-19Merge branch 'joeyconfig'Joey Hess
2014-08-19blearghJoey Hess
2014-08-19Merge branch 'joeyconfig'Joey Hess
2014-08-19oh, can't use cabal sdist --list-sourcesJoey Hess
Doesn't work when using ./Setup as cabal
2014-08-19Merge branch 'joeyconfig'Joey Hess
2014-08-19syntaxJoey Hess
2014-08-19Merge branch 'joeyconfig'Joey Hess
2014-08-19syntaxJoey Hess
2014-08-19Merge branch 'joeyconfig'Joey Hess
2014-08-19oops, can't rely on a git repo when building debian package..Joey Hess
2014-08-19color messageJoey Hess
2014-08-19Merge branch 'joeyconfig'Joey Hess
2014-08-19fixesJoey Hess
2014-08-19Merge branch 'joeyconfig'Joey Hess
2014-08-19prep releaseJoey Hess