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 2014-06-19 14:22:21 -04:00
commit 8fd2a0f65f
3 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
doc/devblog/day_187__release_prep/comment_1_206692d16177c2a9ca11c0eeff545697._comment Normal file
View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawlnoH5btjn_BLib3_IhES5uMhrzuOiwCYo"
nickname="András"
subject="sync options?"
date="2014-06-19T13:16:51Z"
content="""
What options will we have in this beta for windows <=> windows (local network) and windows <=> linux (remote server) synchronization? I'm interested only in non-cloud sync possibilities.
(I tried to follow the developments but apparently failed...)
Also thank you for working on the windows port!
"""]]

1
doc/forum/How_to_make_a_server_store_the_files.mdwn Normal file
View file

@ -0,0 +1 @@
How can I make one of my servers keep a copy of the files on the server, so I can easily SFTP in and download the files. I don't want to see the .git folder, I want to see the files synced there.

13
doc/install/fromscratch/comment_1_9d085e460553fa045999ab7cb945cdec._comment Normal file
View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="azul"
ip="91.36.153.149"
subject="cabal fails to resolve dependencies"
date="2014-06-19T08:49:05Z"
content="""
I tried this on ubuntu 14.04 without any previous haskell installs and cabal failed to resolve the dependencies:
rejecting: optparse-applicative-0.9.0 (conflict: hjsmin =>
optparse-applicative>=0.7 && <0.9)
[full log](paste.debian.net/105771/)
"""]]