| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2014-08-22 | Merge branch 'joeyconfig' | Joey Hess | |
| 2014-08-22 | prep release | Joey Hess | |
| 2014-08-22 | Merge branch 'joeyconfig' | Joey Hess | |
| 2014-08-21 | propellor spin | Joey Hess | |
| 2014-08-21 | comments | Joey Hess | |
| 2014-08-21 | propellor spin | Joey Hess | |
| 2014-08-19 | Merge branch 'joeyconfig' | Joey Hess | |
| 2014-08-19 | keep warning of out of date after updating upstream/master, until it gets merged | Joey Hess | |
| 2014-08-19 | Merge branch 'joeyconfig' | Joey Hess | |
| 2014-08-19 | fix man page installation | Joey Hess | |
| 2014-08-19 | Merge branch 'joeyconfig' | Joey Hess | |
| 2014-08-19 | remove origin remote after local clone | Joey Hess | |
| It's not useful, since it'll change to something that cannot be directly merged with. | |||
| 2014-08-19 | reorg manpage | Joey Hess | |
| 2014-08-19 | Merge branch 'joeyconfig' | Joey Hess | |
| 2014-08-19 | -X | Joey Hess | |
| 2014-08-19 | Merge branch 'joeyconfig' | Joey Hess | |
| 2014-08-19 | need to -s theirs or the merge is likely to fail | Joey Hess | |
| 2014-08-19 | Merge branch 'joeyconfig' | Joey Hess | |
| 2014-08-19 | simpler merge | Joey 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-19 | Merge branch 'joeyconfig' | Joey Hess | |
| 2014-08-19 | need to connect up history | Joey Hess | |
| 2014-08-19 | Merge branch 'joeyconfig' | Joey Hess | |
| 2014-08-19 | beargN | Joey Hess | |
| 2014-08-19 | Merge branch 'joeyconfig' | Joey Hess | |
| 2014-08-19 | merge from master | Joey Hess | |
| 2014-08-19 | Merge branch 'joeyconfig' | Joey Hess | |
| 2014-08-19 | merge from master | Joey Hess | |
| 2014-08-19 | Merge branch 'joeyconfig' | Joey Hess | |
| Conflicts: Makefile | |||
| 2014-08-19 | bleargh45678etc | Joey Hess | |
| 2014-08-19 | bleargh3 | Joey Hess | |
| 2014-08-19 | Merge branch 'joeyconfig' | Joey Hess | |
| 2014-08-19 | double bleargh | Joey Hess | |
| 2014-08-19 | Merge branch 'joeyconfig' | Joey Hess | |
| 2014-08-19 | bleargh | Joey Hess | |
| 2014-08-19 | Merge branch 'joeyconfig' | Joey Hess | |
| 2014-08-19 | oh, can't use cabal sdist --list-sources | Joey Hess | |
| Doesn't work when using ./Setup as cabal | |||
| 2014-08-19 | Merge branch 'joeyconfig' | Joey Hess | |
| 2014-08-19 | syntax | Joey Hess | |
| 2014-08-19 | Merge branch 'joeyconfig' | Joey Hess | |
| 2014-08-19 | syntax | Joey Hess | |
| 2014-08-19 | Merge branch 'joeyconfig' | Joey Hess | |
| 2014-08-19 | oops, can't rely on a git repo when building debian package.. | Joey Hess | |
| 2014-08-19 | color message | Joey Hess | |
| 2014-08-19 | Merge branch 'joeyconfig' | Joey Hess | |
| 2014-08-19 | fixes | Joey Hess | |
| 2014-08-19 | Merge branch 'joeyconfig' | Joey Hess | |
| 2014-08-19 | prep release | Joey Hess | |
| 2014-08-19 | Merge branch 'joeyconfig' | Joey Hess | |
| 2014-08-19 | fix | Joey Hess | |
| 2014-08-19 | Merge branch 'joeyconfig' | Joey Hess | |
