Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | comment | Joey Hess | 2016-09-21 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2016-09-21 |
|\ | |||
* | | response | Joey Hess | 2016-09-21 |
| | | |||
* | | response | Joey Hess | 2016-09-21 |
| | | |||
* | | comment | Joey Hess | 2016-09-21 |
| | | |||
* | | update | Joey Hess | 2016-09-21 |
| | | |||
* | | merge | Joey Hess | 2016-09-21 |
| | | |||
* | | comment | Joey Hess | 2016-09-21 |
| | | |||
| * | Added a comment | interfect@b151490178830f44348aa57b77ad58c7d18e8fe7 | 2016-09-21 |
| | | |||
* | | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2016-09-21 |
|\| | |||
* | | fix bugs in handing of deep branches with sync and adjusted branches | Joey Hess | 2016-09-21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sync: Previously, when run in a branch with a slash in its name, such as "foo/bar", the sync branch was "synced/bar". That conflicted with the sync branch used for branch "bar", so has been changed to "synced/foo/bar". * adjust: Previously, when adjusting a branch with a slash in its name, such as "foo/bar", the adjusted branch was "adjusted/bar(unlocked)". That conflicted with the adjusted branch used for branch "bar", so has been changed to "adjusted/foo/bar(unlocked)" * Also, running sync in an adjusted branch did not correctly sync changes back to the parent branch when it had a slash in its name. This bug has been fixed. Eliminate use of Git.Ref.under and Git.Ref.basename; using Git.Ref.underBase and Git.Ref.base make everything handle deep branches correctly. Probably noone was adjusting deep branches, and v6 is still experimental anyway, so I'm not going to worry about the mess that was left by that bug. In the case of git-annex sync, using a fixed git-annex with an old unfixed one will mean they use different sync branches for a deep branch, and so they may stop syncing until the old one is upgraded. However, that's only a problem when syncing between repositories without going via a central bare repository. Added a warning about this to the CHANGELOG, but it's probably not going to affect many people at all. This commit was sponsored by Riku Voipio. | ||
| * | Added a comment: Pre Commit Hook | interfect@b151490178830f44348aa57b77ad58c7d18e8fe7 | 2016-09-21 |
| | | |||
* | | improve comment | Joey Hess | 2016-09-21 |
| | | |||
* | | bug | Joey Hess | 2016-09-21 |
|/ | |||
* | comments | Joey Hess | 2016-09-21 |
| | |||
* | comment, retitle | Joey Hess | 2016-09-21 |
| | |||
* | comment and close | Joey Hess | 2016-09-21 |
| | |||
* | response | Joey Hess | 2016-09-21 |
| | |||
* | comment | Joey Hess | 2016-09-21 |
| | |||
* | comment | Joey Hess | 2016-09-21 |
| | |||
* | lacking problem description | Joey Hess | 2016-09-21 |
| | |||
* | close | Joey Hess | 2016-09-21 |
| | |||
* | comment | Joey Hess | 2016-09-21 |
| | |||
* | comment | Joey Hess | 2016-09-21 |
| | |||
* | comment | Joey Hess | 2016-09-21 |
| | |||
* | comment | Joey Hess | 2016-09-21 |
| | |||
* | answer | Joey Hess | 2016-09-21 |
| | |||
* | comment | Joey Hess | 2016-09-21 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2016-09-21 |
|\ | |||
* | | update | Joey Hess | 2016-09-21 |
| | | |||
| * | (no commit message) | braiamp@5e499cae72e60f63a517d773978deffdfec35c4c | 2016-09-21 |
|/ | |||
* | Added a comment | PaulK | 2016-09-19 |
| | |||
* | Added a comment: Groups... | kevin@f9ce8e46ad8c29b25093b82cf68fae38f54b89a1 | 2016-09-18 |
| | |||
* | (no commit message) | kevin@f9ce8e46ad8c29b25093b82cf68fae38f54b89a1 | 2016-09-18 |
| | |||
* | promote the neurodebian backport since the official backport looks like it ↵ | https://anarc.at/openid/ | 2016-09-18 |
| | | | | will never come | ||
* | (no commit message) | git-starter | 2016-09-16 |
| | |||
* | I got the files to come back, but I don't want Android making these dumb ↵ | interfect@b151490178830f44348aa57b77ad58c7d18e8fe7 | 2016-09-16 |
| | | | | delete-loads-of-newly-added-stuff commits | ||
* | (no commit message) | interfect@b151490178830f44348aa57b77ad58c7d18e8fe7 | 2016-09-16 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2016-09-15 |
|\ | |||
* | | info: Support being passed a treeish, and show info about the annexed files ↵ | Joey Hess | 2016-09-15 |
| | | | | | | | | in it similar to how a directory is handled. | ||
| * | Added a comment | Adam000 | 2016-09-15 |
| | | |||
| * | Added a comment | Adam000 | 2016-09-15 |
| | | |||
| * | (no commit message) | Adam000 | 2016-09-15 |
|/ | |||
* | comment | Joey Hess | 2016-09-15 |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2016-09-15 |
|\ | |||
* | | stack.yaml: Update to lts-7.0 (ghc 8) | Joey Hess | 2016-09-15 |
| | | | | | | | | | | A few of these extra-deps are setting versions to work around various library dep issues with ghc 8. | ||
* | | remove redundant constraint | Joey Hess | 2016-09-15 |
| | | |||
* | | remove workaround for ghc 8.0; that is mostly sorted out upstream now | Joey Hess | 2016-09-14 |
| | | |||
| * | (no commit message) | Adam000 | 2016-09-15 |
| | | |||
| * | (no commit message) | Adam000 | 2016-09-15 |
|/ |