Commit graph

27384 commits

Author SHA1 Message Date
Joey Hess
cc1958f416
response 2020-02-20 15:31:42 -04:00
Ilya_Shlyakhter
d521220e0e Added a comment: backends vs special remotes 2020-02-20 19:23:07 +00:00
Joey Hess
48fc8b7c4e
Merge branch 'master' of ssh://git-annex.branchable.com 2020-02-20 14:50:46 -04:00
Joey Hess
f2a925a3f5
comment 2020-02-20 14:45:12 -04:00
Joey Hess
17b3c66a61
followup and merge 2020-02-20 13:35:37 -04:00
Joey Hess
be2a9e12bb
close 2020-02-20 13:22:37 -04:00
Joey Hess
0f9bf2d434
comments 2020-02-20 12:40:34 -04:00
annex2384@290036d126d86bcec28ee2f2ead549de1f59e90e
3df2c2786c Added a comment: Backend which doesn't stoee files at all? 2020-02-20 14:52:25 +00:00
Ilya_Shlyakhter
55b0300b4c Added a comment 2020-02-20 03:50:53 +00:00
titaniumfiles@5227364ee3e2f9207bc36b6ebb281fc7af6d3c16
d71d7ac2f5 Added a comment 2020-02-20 02:02:06 +00:00
Ilya_Shlyakhter
027b3d1f71 Added a comment 2020-02-20 01:09:56 +00:00
titaniumfiles@5227364ee3e2f9207bc36b6ebb281fc7af6d3c16
3ed667980a 2020-02-20 00:06:21 +00:00
Ilya_Shlyakhter
a6b9092467 added forum item re: auto-fetching annexed files on open() 2020-02-19 21:11:06 +00:00
Joey Hess
79a9475007
devblog 2020-02-19 15:16:24 -04:00
Joey Hess
f2ccd6c772
remove instructions for v0 upgrade 2020-02-19 15:10:58 -04:00
Joey Hess
de144d3867
clean up 2020-02-19 15:04:31 -04:00
Joey Hess
560e9eb8da
remove obsolete comments
more complaining about git add behavior change, will I ever find the end
of it?
2020-02-19 15:02:09 -04:00
Joey Hess
3407af4112
remove tips for v2 and v3 upgrade
Chances any v1 or v2 repos still exist is approximately 0.
2020-02-19 14:59:20 -04:00
Joey Hess
843f024469
fix formatting 2020-02-19 14:56:02 -04:00
Joey Hess
04258f759a
this page is not a bts 2020-02-19 14:52:10 -04:00
Joey Hess
76dc30c168
Merge branch 'master' of ssh://git-annex.branchable.com 2020-02-19 14:48:38 -04:00
Ilya_Shlyakhter
8957006c06 Added a comment: preventing fetching from special remotes 2020-02-19 18:45:10 +00:00
Joey Hess
029c883713
Merge branch 'master' into v8 2020-02-19 14:32:11 -04:00
Joey Hess
a22ed03d0f
tighten up docs of dotfiles changes 2020-02-19 14:29:50 -04:00
Joey Hess
d35e2da5cb
clean up some very confusing language about non-special remotes 2020-02-19 13:01:20 -04:00
Joey Hess
e02b3b32f1
comment 2020-02-19 13:01:15 -04:00
Joey Hess
30f0858c71
clean up 2020-02-19 12:47:52 -04:00
Joey Hess
4ee7067e8e
add news item for git-annex 7.20200219 2020-02-19 12:46:25 -04:00
Dan
ad6cc2178a Added a comment: Avoid fetching from special remotes 2020-02-19 00:22:06 +00:00
Ilya_Shlyakhter
0ae1a3335e Added a comment: thanks 2020-02-18 20:00:17 +00:00
Ilya_Shlyakhter
af91e5e5e7 Added a comment: git-annex build-time dependencies 2020-02-18 19:33:35 +00:00
Joey Hess
c4a1b04e8b
comment 2020-02-18 12:51:59 -04:00
Joey Hess
f1a1669224
clarify description of synced/ branches 2020-02-18 12:42:44 -04:00
Nick_P
cc4521068c Added a comment 2020-02-18 10:17:29 +00:00
Nick_P
27cf7424f2 Added a comment 2020-02-18 10:15:14 +00:00
Dan
216c2154ec Added a comment: An overdue and overlong reply 2020-02-17 22:59:22 +00:00
Joey Hess
a78eb6dd58
sync --only-annex and annex.synconlyannex
* Added sync --only-annex, which syncs the git-annex branch and annexed
  content but leaves managing the other git branches up to you.
* Added annex.synconlyannex git config setting, which can also be set with
  git-annex config to configure sync in all clones of the repo.

Use case is then the user has their own git workflow, and wants to use
git-annex without disrupting that, so they sync --only-annex to get the
git-annex stuff in sync in addition to their usual git workflow.

When annex.synconlyannex is set, --not-only-annex can be used to override
it.

It's not entirely clear what --only-annex --commit or --only-annex
--push should do, and I left that combination not documented because I
don't know if I might want to change the current behavior, which is that
such options do not override the --only-annex. My gut feeling is that
there is no good reasons to use such combinations; if you want to use
your own git workflow, you'll be doing your own committing and pulling
and pushing.

A subtle question is, how should import/export special remotes be handled?
Importing updates their remote tracking branch and merges it into master.
If --only-annex prevented that git branch stuff, then it would prevent
exporting to the special remote, in the case where it has changes that
were not imported yet, because there would be a unresolved conflict.

I decided that it's best to treat the fact that there's a remote tracking
branch for import/export as an implementation detail in this case. The more
important thing is that an import/export special remote is entirely annexed
content, and so it makes a lot of sense that --only-annex will still sync
with it.
2020-02-17 16:33:10 -04:00
Dan
1c387175eb Added a comment: Thanks 2020-02-17 17:52:22 +00:00
Joey Hess
96eb008910
comment 2020-02-17 13:42:21 -04:00
Joey Hess
9c94bd138f
comment 2020-02-17 13:11:01 -04:00
Joey Hess
87356a8f32
response 2020-02-17 13:04:18 -04:00
Joey Hess
39864fe1b4
close wontfix 2020-02-17 12:53:27 -04:00
Joey Hess
f4bf2ccc7a
comment 2020-02-17 12:45:00 -04:00
Joey Hess
f3682e50e5
response 2020-02-17 12:29:18 -04:00
Joey Hess
d04e6aac6c
comment 2020-02-17 12:26:09 -04:00
Joey Hess
d2e0996c04
comment 2020-02-17 12:04:54 -04:00
Joey Hess
ef3e203436
comment 2020-02-17 11:56:08 -04:00
Ilya_Shlyakhter
ae75b673cf Added a comment 2020-02-16 04:05:11 +00:00
yarikoptic
3d4f068796 Added a comment 2020-02-15 04:45:05 +00:00
Ilya_Shlyakhter
703a88a58e Added a comment: ssh caching 2020-02-14 20:53:30 +00:00