summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* devblogGravatar Joey Hess2016-09-21
|
* updateGravatar Joey Hess2016-09-21
|
* commentGravatar Joey Hess2016-09-21
|
* addurl, importfeed: Improve behavior when file being added is gitignored.Gravatar Joey Hess2016-09-21
|
* commentGravatar Joey Hess2016-09-21
|
* commentGravatar Joey Hess2016-09-21
|
* commentGravatar Joey Hess2016-09-21
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-09-21
|\
* | responseGravatar Joey Hess2016-09-21
| |
* | responseGravatar Joey Hess2016-09-21
| |
* | commentGravatar Joey Hess2016-09-21
| |
* | updateGravatar Joey Hess2016-09-21
| |
* | mergeGravatar Joey Hess2016-09-21
| |
* | commentGravatar Joey Hess2016-09-21
| |
| * Added a commentGravatar interfect@b151490178830f44348aa57b77ad58c7d18e8fe72016-09-21
| |
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-09-21
|\|
* | fix bugs in handing of deep branches with sync and adjusted branchesGravatar Joey Hess2016-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 HookGravatar interfect@b151490178830f44348aa57b77ad58c7d18e8fe72016-09-21
| |
* | improve commentGravatar Joey Hess2016-09-21
| |
* | bugGravatar Joey Hess2016-09-21
|/
* commentsGravatar Joey Hess2016-09-21
|
* comment, retitleGravatar Joey Hess2016-09-21
|
* comment and closeGravatar Joey Hess2016-09-21
|
* responseGravatar Joey Hess2016-09-21
|
* commentGravatar Joey Hess2016-09-21
|
* commentGravatar Joey Hess2016-09-21
|
* lacking problem descriptionGravatar Joey Hess2016-09-21
|
* closeGravatar Joey Hess2016-09-21
|
* commentGravatar Joey Hess2016-09-21
|
* commentGravatar Joey Hess2016-09-21
|
* commentGravatar Joey Hess2016-09-21
|
* commentGravatar Joey Hess2016-09-21
|
* answerGravatar Joey Hess2016-09-21
|
* commentGravatar Joey Hess2016-09-21
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-09-21
|\
* | updateGravatar Joey Hess2016-09-21
| |
| * (no commit message)Gravatar braiamp@5e499cae72e60f63a517d773978deffdfec35c4c2016-09-21
|/
* Added a commentGravatar PaulK2016-09-19
|
* Added a comment: Groups...Gravatar kevin@f9ce8e46ad8c29b25093b82cf68fae38f54b89a12016-09-18
|
* (no commit message)Gravatar kevin@f9ce8e46ad8c29b25093b82cf68fae38f54b89a12016-09-18
|
* promote the neurodebian backport since the official backport looks like it ↵Gravatar https://anarc.at/openid/2016-09-18
| | | | will never come
* (no commit message)Gravatar git-starter2016-09-16
|
* I got the files to come back, but I don't want Android making these dumb ↵Gravatar interfect@b151490178830f44348aa57b77ad58c7d18e8fe72016-09-16
| | | | delete-loads-of-newly-added-stuff commits
* (no commit message)Gravatar interfect@b151490178830f44348aa57b77ad58c7d18e8fe72016-09-16
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-09-15
|\
* | info: Support being passed a treeish, and show info about the annexed files ↵Gravatar Joey Hess2016-09-15
| | | | | | | | in it similar to how a directory is handled.
| * Added a commentGravatar Adam0002016-09-15
| |
| * Added a commentGravatar Adam0002016-09-15
| |
| * (no commit message)Gravatar Adam0002016-09-15
|/
* commentGravatar Joey Hess2016-09-15
|