git-annex/Assistant
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
..
Alert update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Install update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Pairing update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Threads use filepath-bytestring for annex object manipulations 2019-12-11 15:25:07 -04:00
Types update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
WebApp add LISTCONFIGS to external special remote protocol 2020-01-17 16:07:17 -04:00
Alert.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
BranchChange.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Changes.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Commits.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Common.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
CredPairCache.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
DaemonStatus.hs add LISTCONFIGS to external special remote protocol 2020-01-17 16:07:17 -04:00
DeleteRemote.hs cache the serialization of a Key 2019-11-22 17:49:16 -04:00
Drop.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Fsck.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Gpg.hs be stricter about rejecting invalid configurations for remotes 2020-01-10 14:52:48 -04:00
Install.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
MakeRemote.hs be stricter about rejecting invalid configurations for remotes 2020-01-10 14:52:48 -04:00
MakeRepo.hs everything is building again 2019-12-05 15:10:23 -04:00
Monad.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
NamedThread.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Pairing.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Pushes.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
RemoteControl.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Repair.hs more RawFilePath 2019-12-18 17:10:28 -04:00
RepoProblem.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Restart.hs make --json-error-messages capture url download errors 2019-11-12 13:52:38 -04:00
ScanRemotes.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Ssh.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Sync.hs sync --only-annex and annex.synconlyannex 2020-02-17 16:33:10 -04:00
TransferQueue.hs cache the serialization of a Key 2019-11-22 17:49:16 -04:00
TransferrerPool.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
TransferSlots.hs everything is building again 2019-12-05 15:10:23 -04:00
Unused.hs convert TopFilePath to use RawFilePath 2019-12-09 15:07:21 -04:00
Upgrade.hs use filepath-bytestring for annex object manipulations 2019-12-11 15:25:07 -04:00
WebApp.hs unified AuthToken type between webapp and tor 2016-11-22 14:18:34 -04:00