mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2018-10-11 13:33:14 -04:00
commit c5b6c55afc
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/forum/Copy_modified_content_to_a_repo_that_only_wants_content_already_present/comment_2_0b13914351aeb57fd7684ff2041618ee._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="ericm"
avatar="http://cdn.libravatar.org/avatar/67ca64c5a99fb142fc2e3916333881ca"
subject="comment 2"
date="2018-10-10T23:20:17Z"
content="""
Yeah I realized that what I want to achieve is not currently possible. So I just modified a bit the standard client preferred content, removing the archive folder part,
"""]]

2
doc/forum/Unlocking_files_gives_symlink_content.mdwn
View file

@ -1,4 +1,4 @@
I am just beginning to use git-annex so it is possible that the following issue was caused by my own mishap. It cropped after commiting a number of files that had been moved between folders.
I am just beginning to use git-annex so it is possible that the following issue was caused by my own mistake. It cropped after commiting a number of files that had been moved between subfolders, and added with `git add -A` etc.
When files are locked, I am able to view their contents. However, when I unlock certain files, their contents appear to be replaced by the contents of the symlink. Locking them again allows me to view their contents. For instance, with one unlocked file, say `test.md`, I get

9
doc/tips/install_on_Android_in_Termux/comment_22_39e2f2100a49f986760db389cf10240b._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e"
nickname="branchable"
avatar="http://cdn.libravatar.org/avatar/ae41dba34ee6000056f00793c695be75"
subject="Works now!!"
date="2018-10-11T16:09:00Z"
content="""
Thanks a lot @joey, after running `termux-fix-shebang git-annex.linux/bin/*` this new build works!
"""]]

8
doc/todo/Natively_support_s3__58____47____47___urls___40__for_addurl__44___get__44___etc__41__/comment_13_20184de38c2adeed7e20fa323d9a3ba4._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="Ilya_Shlyakhter"
avatar="http://cdn.libravatar.org/avatar/1647044369aa7747829c38b9dcc84df0"
subject="comment 13"
date="2018-10-11T12:03:12Z"
content="""
So, it was some odd misconfiguration — I initremote’d a new external special remote of the same externaltype, set the old one to annex-ignore, and things seem to work.
"""]]