archimedes
67b9805a3e
2017-04-05 19:05:07 +00:00
Joey Hess
ee8bbf33bb
followup
2017-04-05 14:47:49 -04:00
Joey Hess
8c722069ea
Merge branch 'master' of ssh://git-annex.branchable.com
2017-04-05 13:27:29 -04:00
Joey Hess
29e73f76ef
Added remote.<name>.annex-push and remote.<name>.annex-pull
...
The former can be useful to make remotes that don't get fully synced with
local changes, which comes up in a lot of situations.
The latter was mostly added for symmetry, but could be useful (though less
likely to be).
Implementing `remote.<name>.annex-pull` was a bit tricky, as there's no one
place where git-annex pulls/fetches from remotes. I audited all
instances of "fetch" and "pull". A few cases were left not checking this
config:
* Git.Repair can try to pull missing refs from a remote, and if the local
repo is corrupted, that seems a reasonable thing to do even though
the config would normally prevent it.
* Assistant.WebApp.Gpg and Remote.Gcrypt and Remote.Git do fetches
as part of the setup process of a remote. The config would probably not
be set then, and having the setup fail seems worse than honoring it if it
is already set.
I have not prevented all the code that does a "merge" from merging branches
from remotes with remote.<name>.annex-pull=false. That could perhaps
be done, but it would need a way to map from branch name to remote name,
and the way refspecs work makes that hard to get really correct. So if the
user fetches manually, the git-annex branch will get merged, for example.
Anther way of looking at/justifying this is that the setting is called
"annex-pull", not "annex-merge".
This commit was supported by the NSF-funded DataLad project.
2017-04-05 13:22:35 -04:00
git-annex@6f13b739194f758abc0b86556b7ce966c1bf3c00
f6b1a2a027
Added a comment: git-remote-gcrypt recommends rsync:// or sftp:// transports
2017-04-05 16:16:25 +00:00
Joey Hess
eab6146e53
comment
2017-04-05 11:59:03 -04:00
Joey Hess
e7d684b4e3
comment
2017-04-05 11:51:51 -04:00
Joey Hess
816c0d597a
comment
2017-04-05 11:47:08 -04:00
Joey Hess
ee9b85f390
comment
2017-04-05 11:44:29 -04:00
Joey Hess
3b84209c17
comment
2017-04-05 11:41:59 -04:00
Joey Hess
74af1d2dfe
comment
2017-04-05 11:25:18 -04:00
Joey Hess
c6d5d8f9bf
fix windows build
2017-04-05 11:19:29 -04:00
Yaroslav Halchenko
6f9b3875d6
refreshed standalone debian pkg patch for uftp being added to suggests
2017-04-03 15:58:10 -04:00
Joey Hess
d9766d4aa7
Merge branch 'master' of ssh://git-annex.branchable.com
2017-04-03 14:53:49 -04:00
Joey Hess
256eb4807e
add missing "do"
...
Unsure how it got committed in an uncompilable state before..
2017-04-03 14:52:54 -04:00
t.z.mates
e1642d19aa
Added a comment
2017-04-02 04:17:55 +00:00
anarcat
1f6b8951ba
Added a comment: point to point?
2017-03-31 13:09:00 +00:00
Joey Hess
74a06b535c
devblog
2017-03-30 19:38:47 -04:00
Joey Hess
c3970f6c1a
multicast: New command, uses uftp to multicast annexed files, for eg a classroom setting.
...
This commit was supported by the NSF-funded DataLad project.
2017-03-30 19:35:30 -04:00
Joey Hess
39e8433d46
fix format
2017-03-30 14:16:13 -04:00
Joey Hess
43d7862b44
design
2017-03-30 14:15:12 -04:00
Joey Hess
2f4af8ef93
Merge branch 'master' of ssh://git-annex.branchable.com
2017-03-30 12:51:14 -04:00
yarikoptic
3a03665b4f
2017-03-30 16:08:07 +00:00
yarikoptic
f6d34d228e
initial idea
2017-03-30 16:07:43 +00:00
Joey Hess
a7b068f271
Merge branch 'master' of ssh://git-annex.branchable.com
2017-03-30 11:31:38 -04:00
anarcat
d2dd75f2b9
Added a comment: onion-grater
2017-03-30 14:49:13 +00:00
oberix@c7a19cddb1663df0c612a979b9d13b0d67f1f69a
a5b3b7a5a4
Added a comment: autostart and foreground together doesn't seem to work
2017-03-30 10:43:19 +00:00
woffs
627ee14612
2017-03-29 20:24:14 +00:00
Joey Hess
3c8eb59860
When a http remote does not expose an annex.uuid config, only warn about it once, not every time git-annex is run.
...
Same behavior as for a ssh remote.
2017-03-29 12:43:47 -04:00
fabfur
3795278338
2017-03-28 20:25:39 +00:00
Joey Hess
d6afd70e20
WSL can now run git-annex
2017-03-27 21:40:45 -04:00
Joey Hess
0e7276b5ac
stack.yaml: Update to lts-8.6.
2017-03-27 20:01:46 -04:00
Joey Hess
a2017e944f
expand
2017-03-27 18:12:46 -04:00
Joey Hess
9ee05e66a6
Merge branch 'master' of ssh://git-annex.branchable.com
2017-03-27 18:10:44 -04:00
Joey Hess
9fcd3987f2
idea
2017-03-27 18:10:36 -04:00
anarcat
eef99dee60
add annex-sync setting sample
2017-03-27 19:50:43 +00:00
Joey Hess
8c36345e86
Merge branch 'master' of ssh://git-annex.branchable.com
2017-03-27 15:21:10 -04:00
Joey Hess
9b2e56a9ce
bug report from Hands-on Reproducible and Scalable Brain Imaging Analysis with Nipype
2017-03-27 15:11:45 -04:00
anarcat
a959b98769
link to torrent page
2017-03-27 16:25:31 +00:00
anarcat
49f1ee9610
some issue i have come up with a few times and workarounds
2017-03-27 16:23:15 +00:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
c6094c43fa
2017-03-27 11:34:41 +00:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
5f64e2007a
2017-03-27 09:36:05 +00:00
benjamin.poldrack@d09ccff6d42dd20277610b59867cf7462927b8e3
b7b70acd71
Added a comment
2017-03-27 09:03:10 +00:00
Cyberthal
2076d04231
Added a comment: knowing about annex-ignore and git-annex shell helps
2017-03-26 10:06:35 +00:00
Cyberthal
86db277648
2017-03-26 10:02:22 +00:00
yarikoptic
ea8d0d923b
2017-03-24 21:10:44 +00:00
Cyberthal
9d21f1461b
2017-03-24 15:59:12 +00:00
Cyberthal
9713258e9b
2017-03-24 15:10:10 +00:00
magnitude
de864ef0de
2017-03-24 06:07:04 +00:00
yarikoptic
a6430481c4
initial report
2017-03-23 04:09:44 +00:00
