Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2016-04-06 | |
|\ | |||
* | | devbog | 2016-04-06 | |
| | | |||
* | | one little bug.. | 2016-04-06 | |
| | | |||
* | | fix auto merge conflict resolution when doing out of tree merge for adjusted ↵ | 2016-04-06 | |
| | | | | | | | | branch | ||
* | | new method for merging changes into adjusted branch that avoids unncessary ↵ | 2016-04-06 | |
| | | | | | | | | | | | | merge conflicts Still needs work when there are actual merge conflicts. | ||
| * | (no commit message) | 2016-04-06 | |
| | | |||
| * | (no commit message) | 2016-04-06 | |
| | | |||
| * | Added a comment | 2016-04-06 | |
| | | |||
| * | Added a comment | 2016-04-05 | |
| | | |||
| * | Added a comment | 2016-04-05 | |
|/ | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2016-04-05 | |
|\ | |||
* | | another reason | 2016-04-05 | |
| | | |||
| * | Added a comment | 2016-04-05 | |
| | | |||
| * | (no commit message) | 2016-04-05 | |
| | | |||
| * | (no commit message) | 2016-04-05 | |
| | | |||
| * | Added a comment | 2016-04-05 | |
| | | |||
| * | Added a comment | 2016-04-05 | |
| | | |||
| * | Added a comment | 2016-04-04 | |
|/ | |||
* | devblog | 2016-04-04 | |
| | |||
* | comment | 2016-04-04 | |
| | |||
* | wording | 2016-04-04 | |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2016-04-04 | |
|\ | |||
* | | comment | 2016-04-04 | |
| | | |||
| * | comment | 2016-04-04 | |
| | | |||
| * | simplify manpage example and ask another question | 2016-04-04 | |
| | | | | | | | | sorry for the noise again... | ||
* | | response | 2016-04-04 | |
|/ | |||
* | response | 2016-04-04 | |
| | |||
* | comment | 2016-04-04 | |
| | |||
* | comment | 2016-04-04 | |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2016-04-04 | |
|\ | |||
* | | comment and improve docs | 2016-04-04 | |
| | | |||
| * | Added a comment: clarified manpage | 2016-04-04 | |
| | | |||
* | | comment | 2016-04-04 | |
| | | |||
| * | add examples on how to manually setup the remote keys setup by the assistant | 2016-04-04 | |
| | | |||
* | | comment | 2016-04-04 | |
| | | |||
| * | ugh. so it works with ~/.ssh/git-annex | 2016-04-04 | |
|/ | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2016-04-04 | |
|\ | |||
* | | v6: Close pointer file handles more quickly, to avoid problems on Windows. | 2016-04-04 | |
| | | | | | | | | | | | | Was using L.readFile, so the Handle would remain open until the garbage collector got around to it. Changed to explicit open and close, so we know it's always closed when the function returns. | ||
* | | comment | 2016-04-04 | |
| | | |||
* | | comment | 2016-04-04 | |
| | | |||
* | | comment | 2016-04-04 | |
| | | |||
| * | Clarified CHECKURL-MULTI syntax | 2016-04-04 | |
| | | |||
* | | comment | 2016-04-04 | |
| | | |||
* | | comment | 2016-04-04 | |
| | | |||
* | | todo | 2016-04-04 | |
|/ | |||
* | still bug with sync in adjusted branch | 2016-04-04 | |
| | |||
* | deal with cloning a repo that has an ajdusted branch checked out | 2016-04-04 | |
| | |||
* | update | 2016-04-04 | |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2016-04-04 | |
|\ | |||
* | | Upgrading a direct mode repository to v6 has changed to enter an adjusted ↵ | 2016-04-04 | |
| | | | | | | | | | | | | | | | | unlocked branch. This makes the direct mode to v6 upgrade able to be performed in one clone of a repository without affecting other clones, which can continue using v5 and direct mode. |