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

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

Browse source
This commit is contained in:
Joey Hess 2016-04-18 14:05:51 -04:00
commit 40faf7684b
Failed to extract signature
4 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
doc/bugs/shouldn__39__t_keep_permissions_of_the_ssh_remote__63__/comment_2_65232a9c2bbba075d325ce00b7c5e13f._comment Normal file
View file

@ -0,0 +1,7 @@
[[!comment format=mdwn
username="https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4"
subject="comment 2"
date="2016-04-18T14:16:31Z"
content="""
heh -- it has been awhile and damn me didn't reveal originally the location of such a repository so I could not check if I set group settings for the repo \"correctly\"... don't know now -- would need to replicate at some point and follow up
"""]]

2
doc/design/assistant/polls/prioritizing_special_remotes.mdwn
View file

@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync.
Help me prioritize my work: What special remote would you most like
to use with the git-annex assistant?
[[!poll open=yes 18 "Amazon S3 (done)" 13 "Amazon Glacier (done)" 10 "Box.com (done)" 76 "My phone (or MP3 player)" 27 "Tahoe-LAFS" 16 "OpenStack SWIFT" 37 "Google Drive"]]
[[!poll open=yes 18 "Amazon S3 (done)" 13 "Amazon Glacier (done)" 10 "Box.com (done)" 76 "My phone (or MP3 player)" 28 "Tahoe-LAFS" 16 "OpenStack SWIFT" 37 "Google Drive"]]
This poll is ordered with the options I consider easiest to build
listed first. Mostly because git-annex already supports them and they

16
doc/forum/HowTo_Conflict_Resolution/comment_2_e0ec78f09e5aba83ad3a7252695e4d96._comment Normal file
View file

@ -0,0 +1,16 @@
[[!comment format=mdwn
username="Horus"
subject="comment 2"
date="2016-04-17T14:10:15Z"
content="""
A very belayed reply...
I would really love to see a feature to make this easier! Like
* Interactive merge: During merge the user is asked for each file that conflicts, if it wants to keep the local or the remote
* A set merge tool: A tool that allows to either select the local or remote file, renames it accordingly and commits it.
Currently, I really fear a merge conflict, because I work with sets of binary files that needs to be in a coherent state and a merge conflict gives me very much trouble restoring that state.
Thanks!
"""]]

16
doc/forum/HowTo_Conflict_Resolution/comment_3_495aea6e73fd7a2d7a387f539496ac3a._comment Normal file
View file

@ -0,0 +1,16 @@
[[!comment format=mdwn
username="Horus"
subject="comment 3"
date="2016-04-17T14:10:37Z"
content="""
A very belayed reply...
I would really love to see a feature to make this easier! Like
* Interactive merge: During merge the user is asked for each file that conflicts, if it wants to keep the local or the remote
* A set merge tool: A tool that allows to either select the local or remote file, renames it accordingly and commits it.
Currently, I really fear a merge conflict, because I work with sets of binary files that needs to be in a coherent state and a merge conflict gives me very much trouble restoring that state.
Thanks!
"""]]