summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * populate unlocked files with newly available content when ingestingGravatar Joey Hess2015-12-22
| | | | | | | | | | | | This can happen when ingesting a new file in either locked or unlocked mode, when some unlocked files in the repo use the same key, and the content was not locally available before.
| * finish v6 support for assistantGravatar Joey Hess2015-12-22
| | | | | | | | Seems to basically work now!
| * make linkAnnex detect when the file changes as it's being copied/linked inGravatar Joey Hess2015-12-22
| | | | | | | | | | | | | | | | | | This fixes a race where the modified file ended up in annex/objects, and the InodeCache stored in the database was for the modified version, so git-annex didn't know it had gotten modified. The race could occur when the smudge filter was running; now it gets the InodeCache before generating the Key, which avoids the race.
| * refactoringGravatar Joey Hess2015-12-22
| | | | | | | | no behavior changes
* | link to neurodebian standalone debGravatar Joey Hess2015-12-22
| |
* | remove obsolte note about sid package being out of dateGravatar Joey Hess2015-12-22
| |
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-12-22
|\ \
* | | addurl: Added --with-files option.Gravatar Joey Hess2015-12-22
| | |
* | | refactorGravatar Joey Hess2015-12-22
| | |
| | * wip v6 support for assistantGravatar Joey Hess2015-12-21
| | | | | | | | | | | | Files are not yet added to v6 repos in unlocked mode.
| | * remove (v6) associated file in unannexGravatar Joey Hess2015-12-21
| | |
| | * Merge branch 'master' into smudgeGravatar Joey Hess2015-12-21
| | |\ | |_|/ |/| |
| * | (no commit message)Gravatar https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f42015-12-21
| | |
| * | Added a commentGravatar frost.kristian@75a6b6a25121f985cd8708f98c691d41716ac7202015-12-21
|/ /
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-12-21
|\ \
* | | addurl: Added --batch option.Gravatar Joey Hess2015-12-21
| | |
| * | Added a commentGravatar https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f42015-12-21
| | |
* | | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-12-21
|\| |
| * | Added a commentGravatar cbaines2015-12-21
| | |
| * | Added a commentGravatar frost.kristian@75a6b6a25121f985cd8708f98c691d41716ac7202015-12-21
| | |
| * | Added a commentGravatar cbaines2015-12-21
| | |
| * | Added a commentGravatar cbaines2015-12-21
| | |
| * | Added a commentGravatar https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf5742015-12-21
| | |
| * | Added a comment: A problem with SmartGit then?Gravatar jhannwong@c9c7a67b5632a4bbc0c959cfeb3d340e02f285652015-12-21
| | |
| * | (no commit message)Gravatar frost.kristian@75a6b6a25121f985cd8708f98c691d41716ac7202015-12-20
| | |
| * | Added a commentGravatar sts2015-12-20
| | |
* | | fix build warnings under ghc 7.10Gravatar Joey Hess2015-12-19
|/ / | | | | | | | | | | Caused by AMP.. Since I've finally upgraded my dev laptop to 7.10, I may start missing imports that are not needed with it but are with older versions..
* | updateGravatar Joey Hess2015-12-19
| |
* | reuse commentGravatar Joey Hess2015-12-19
| |
* | commentGravatar Joey Hess2015-12-19
| |
* | commentGravatar Joey Hess2015-12-19
| |
* | commentGravatar Joey Hess2015-12-19
| |
* | commentGravatar Joey Hess2015-12-19
| |
* | commentGravatar Joey Hess2015-12-19
| |
* | commentGravatar Joey Hess2015-12-19
| |
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-12-19
|\ \
* | | status: On crippled filesystems, was displaying M for all annexed files that ↵Gravatar Joey Hess2015-12-19
| | | | | | | | | | | | were present. Probably caused by a change to what git status displays in this situation. Fixed by treating files git thinks are modified the same as typechanged files.
| * | (no commit message)Gravatar https://openid.stackexchange.com/user/e65e6d0e-58ba-41de-84cc-1f2ba54cf5742015-12-19
|/ /
* | add news item for git-annex 5.20151218Gravatar Joey Hess2015-12-18
| |
* | Merge branch 'master' of ssh://git-annex.branchable.com5.20151218Gravatar Joey Hess2015-12-18
|\ \
| * | Added a commentGravatar neocryptek@659edac901ffbc8e541a974f8f18987eeafc63bd2015-12-18
| | |
* | | prep releaseGravatar Joey Hess2015-12-18
|/ /
| * interaction with shared clonesGravatar Joey Hess2015-12-17
| |
* | Added a commentGravatar SamuelTardieu2015-12-17
| |
* | (no commit message)Gravatar jhannwong@c9c7a67b5632a4bbc0c959cfeb3d340e02f285652015-12-17
| |
* | (no commit message)Gravatar pete.ward@26c41318616c4cf9601d0431557c1df734ccdb772015-12-16
| |
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-12-16
|\ \
* | | devblogGravatar Joey Hess2015-12-16
| | |
| | * updateGravatar Joey Hess2015-12-16
| | |
| | * test suite down to only 4 fails with v6Gravatar Joey Hess2015-12-16
| | |