summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* comment6.20160412Gravatar Joey Hess2016-04-12
* Fix build with ghc v7.11. Thanks, Gabor Greif.Gravatar Joey Hess2016-04-12
* simplify code to make it compilable with ghc v7.11.20150407Gravatar Gabor Greif2016-04-12
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-04-12
|\
* | prep releaseGravatar Joey Hess2016-04-12
* | updateGravatar Joey Hess2016-04-12
* | updateGravatar Joey Hess2016-04-12
* | updateGravatar Joey Hess2016-04-12
* | Fix bug in annex.largefiles mimetype= matching when git-annex is run in a sub...Gravatar Joey Hess2016-04-12
* | responseGravatar Joey Hess2016-04-12
* | responseGravatar Joey Hess2016-04-12
* | add simple test for conflict resolution in adjusted branchGravatar Joey Hess2016-04-12
| * Added a comment: git-annex on a PowerPC based synology?Gravatar Jan2016-04-12
|/
* todoGravatar Joey Hess2016-04-11
* remove incorrect out of dateness warningGravatar Joey Hess2016-04-11
* (no commit message)Gravatar hugues.fontenelle@a0dfbe32c0e6575ef1eb2a2f13cd79ee8761de342016-04-11
* (no commit message)Gravatar xloem2016-04-11
* another thing i forgotGravatar Antoine Beaupré2016-04-10
* fix for manpage generation without hacksGravatar Antoine Beaupré2016-04-10
* (no commit message)Gravatar xloem2016-04-10
* (no commit message)Gravatar annexuser2016-04-10
* Added a commentGravatar j_k_234@b2b1aa189bf195cefd815fc0fe70e0ebbe2b80772016-04-10
* (no commit message)Gravatar j_k_234@b2b1aa189bf195cefd815fc0fe70e0ebbe2b80772016-04-10
* add AdjBranch newtype; some simplicationsGravatar Joey Hess2016-04-09
* devblogGravatar Joey Hess2016-04-09
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-04-09
|\
* | change name of basis branchGravatar Joey Hess2016-04-09
* | fix master push overwrite race when updating adjusted branch, by maintaining ...Gravatar Joey Hess2016-04-09
* | commentGravatar Joey Hess2016-04-09
| * file bugGravatar spwhitton2016-04-09
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-04-09
|\
| * possible fix for markdown generation with pandocGravatar Antoine Beaupré2016-04-09
| * attack the manpage problemGravatar Antoine Beaupré2016-04-09
| * Added a comment: freenet special remoteGravatar 0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d67302016-04-09
| * respondGravatar Antoine Beaupré2016-04-09
| * Added a comment: comment 4Gravatar ExGen2016-04-08
* | windows does not like filenames starting with a dot, renameGravatar Joey Hess2016-04-08
| * Added a comment: comment 3^^Gravatar ExGen2016-04-08
* | fix build with ghc 7.6.3Gravatar Joey Hess2016-04-08
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-04-08
|\|
* | updateGravatar Joey Hess2016-04-08
* | fix build on windows with older ghcGravatar Joey Hess2016-04-08
* | hard links on windowsGravatar Joey Hess2016-04-08
* | avoid withWorkTreeRelated affecting annex symlink calculationGravatar Joey Hess2016-04-08
| * (no commit message)Gravatar 0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d67302016-04-08
| * pull request for Bup.hsGravatar ggreif@8132a868199b4ffec14150c87f538dc06a5382202016-04-08
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-04-06
|\
* | devbogGravatar Joey Hess2016-04-06
* | one little bug..Gravatar Joey Hess2016-04-06
* | fix commit tree after merge into adjusted branchGravatar Joey Hess2016-04-06