Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Fix build with ghc v7.11. Thanks, Gabor Greif. | 2016-04-12 | |
| | |||
* | simplify code to make it compilable with ghc v7.11.20150407 | 2016-04-12 | |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2016-04-12 | |
|\ | |||
* | | prep release | 2016-04-12 | |
| | | |||
* | | update | 2016-04-12 | |
| | | |||
* | | update | 2016-04-12 | |
| | | |||
* | | update | 2016-04-12 | |
| | | |||
* | | Fix bug in annex.largefiles mimetype= matching when git-annex is run in a ↵ | 2016-04-12 | |
| | | | | | | | | subdirectory of the repository. | ||
* | | response | 2016-04-12 | |
| | | |||
* | | response | 2016-04-12 | |
| | | |||
* | | add simple test for conflict resolution in adjusted branch | 2016-04-12 | |
| | | | | | | | | This is not really extensive enough, but a start.. | ||
| * | Added a comment: git-annex on a PowerPC based synology? | 2016-04-12 | |
|/ | |||
* | todo | 2016-04-11 | |
| | |||
* | remove incorrect out of dateness warning | 2016-04-11 | |
| | |||
* | (no commit message) | 2016-04-11 | |
| | |||
* | (no commit message) | 2016-04-11 | |
| | |||
* | another thing i forgot | 2016-04-10 | |
| | |||
* | fix for manpage generation without hacks | 2016-04-10 | |
| | |||
* | (no commit message) | 2016-04-10 | |
| | |||
* | (no commit message) | 2016-04-10 | |
| | |||
* | Added a comment | 2016-04-10 | |
| | |||
* | (no commit message) | 2016-04-10 | |
| | |||
* | add AdjBranch newtype; some simplications | 2016-04-09 | |
| | |||
* | devblog | 2016-04-09 | |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2016-04-09 | |
|\ | |||
* | | change name of basis branch | 2016-04-09 | |
| | | | | | | | | Making the name look too much like the adjusted branch was ambiguous. | ||
* | | fix master push overwrite race when updating adjusted branch, by maintaining ↵ | 2016-04-09 | |
| | | | | | | | | basis ref | ||
* | | comment | 2016-04-09 | |
| | | |||
| * | file bug | 2016-04-09 | |
|/ | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2016-04-09 | |
|\ | |||
| * | possible fix for markdown generation with pandoc | 2016-04-09 | |
| | | |||
| * | attack the manpage problem | 2016-04-09 | |
| | | |||
| * | Added a comment: freenet special remote | 2016-04-09 | |
| | | |||
| * | respond | 2016-04-09 | |
| | | |||
| * | Added a comment: comment 4 | 2016-04-08 | |
| | | |||
* | | windows does not like filenames starting with a dot, rename | 2016-04-08 | |
| | | |||
| * | Added a comment: comment 3^^ | 2016-04-08 | |
| | | |||
* | | fix build with ghc 7.6.3 | 2016-04-08 | |
| | | |||
* | | Merge branch 'master' of ssh://git-annex.branchable.com | 2016-04-08 | |
|\| | |||
* | | update | 2016-04-08 | |
| | | |||
* | | fix build on windows with older ghc | 2016-04-08 | |
| | | |||
* | | hard links on windows | 2016-04-08 | |
| | | | | | | | | | | * annex.thin and annex.hardlink are now supported on Windows. * unannex --fast now makes hard links on Windows. | ||
* | | avoid withWorkTreeRelated affecting annex symlink calculation | 2016-04-08 | |
| | | |||
| * | (no commit message) | 2016-04-08 | |
| | | |||
| * | pull request for Bup.hs | 2016-04-08 | |
|/ | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2016-04-06 | |
|\ | |||
* | | devbog | 2016-04-06 | |
| | | |||
* | | one little bug.. | 2016-04-06 | |
| | | |||
* | | fix commit tree after merge into adjusted branch | 2016-04-06 | |
| | | |||
* | | run out of tree merge with --no-ff | 2016-04-06 | |
| | | | | | | | | | | | | This is how direct mode does it too, and somehow, for reasons that currently escape me, this makes git merge not care if it's run with an empty work tree. |