CI to automate build of cargo lockfiles on different Alpine releases for git-annex aports https://gitlab.alpinelinux.org/alpine/aports/-/tree/master/community/git-annex
Find a file
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
Annex fix warning 2020-02-17 15:06:28 -04:00
Assistant sync --only-annex and annex.synconlyannex 2020-02-17 16:33:10 -04:00
Backend fix ByteString conversion on windows 2019-12-18 13:32:56 -04:00
Build force move 2019-12-31 18:09:17 -04:00
CmdLine initremote --describe-other-params 2020-01-20 16:05:51 -04:00
Command sync --only-annex and annex.synconlyannex 2020-02-17 16:33:10 -04:00
Config separate RemoteConfig parsing basically working 2020-01-14 12:35:08 -04:00
Database ifdef persistent-template 2.8.0 fixes 2020-02-04 13:53:00 -04:00
debian add libghc-filepath-bytestring-dev build dep 2019-12-27 15:10:11 -04:00
doc sync --only-annex and annex.synconlyannex 2020-02-17 16:33:10 -04:00
Git support git remotes that need http basic auth 2020-01-22 16:16:19 -04:00
Limit convert TopFilePath to use RawFilePath 2019-12-09 15:07:21 -04:00
Logs annex.tune.branchhash1=true bugfix 2020-02-14 15:22:48 -04:00
Messages handle git-credential prompt in -J mode 2020-01-22 16:42:15 -04:00
P2P use filepath-bytestring for annex object manipulations 2019-12-11 15:25:07 -04:00
Remote Avoid throwing fatal errors when asked to write to a readonly git remote on http 2020-02-14 14:38:13 -04:00
RemoteDaemon use fromRepo 2019-11-12 10:32:14 -04:00
standalone Display a warning when concurrency is enabled but ssh connection caching is not enabled or won't work due to a crippled filesystem 2020-01-23 12:35:46 -04:00
static Revert "remove newlines from static js and css" 2014-06-13 02:20:39 -04:00
templates cache the serialization of a Key 2019-11-22 17:49:16 -04:00
Test all commands building except for assistant 2019-12-05 14:41:18 -04:00
Types sync --only-annex and annex.synconlyannex 2020-02-17 16:33:10 -04:00
Upgrade annex.tune.branchhash1=true bugfix 2020-02-14 15:22:48 -04:00
Utility handle git-credential prompt in -J mode 2020-01-22 16:42:15 -04:00
.ghci avoid ghci warning on tabs 2019-01-21 12:35:44 -04:00
.gitattributes update changelog location 2016-08-22 23:54:11 -04:00
.gitignore Removed Esqueleto as a dependency. 2018-11-06 22:18:55 +00:00
.mailmap alias for Yaroslav @ yahoo to mailmap 2015-09-09 12:38:59 -04:00
Annex.hs git-annex config annex.largefiles 2019-12-20 13:01:41 -04:00
Assistant.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Backend.hs cache the serialization of a Key 2019-11-22 17:49:16 -04:00
bash-completion.bash bash completion fix 2018-11-12 13:23:05 -04:00
Benchmark.hs new improved benchmark command that can benchmark anything git-annex does 2019-01-04 13:46:36 -04:00
build.bat let build.bat also be run from cygwin terminal 2015-04-21 14:12:14 -04:00
BuildFlags.hs Drop support for building with aws older than 0.14. 2019-04-19 14:27:59 -04:00
BuildInfo.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
CHANGELOG sync --only-annex and annex.synconlyannex 2020-02-17 16:33:10 -04:00
CmdLine.hs get rid of implicitMessages state 2019-06-12 14:01:41 -04:00
Command.hs remove most remnants of direct mode 2019-08-26 16:27:48 -04:00
Common.hs import Utility.FileSystemEncoding in Common 2019-01-03 11:37:02 -04:00
Config.hs separate RemoteConfig parsing basically working 2020-01-14 12:35:08 -04:00
COPYRIGHT 2020 2020-01-10 10:47:59 -04:00
Creds.hs ported Remote.External 2020-01-15 13:01:22 -04:00
Crypto.hs separate RemoteConfig parsing basically working 2020-01-14 12:35:08 -04:00
ghci avoid tab warnings from ghc 8 2016-11-17 13:39:30 -04:00
git-annex.cabal releasing package git-annex version 7.20200204 2020-02-04 14:33:03 -04:00
git-annex.hs include git-annex-shell back in 2019-12-02 11:51:52 -04:00
git-union-merge.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Git.hs convert TopFilePath to use RawFilePath 2019-12-09 15:07:21 -04:00
Jenkinsfile Revert "debugging strange old version of git-annex in windows installer bundle" 2017-10-26 11:32:04 -04:00
Key.hs fix Arbitrary AssociatedFile to not crash when LANG=C 2020-02-02 16:37:25 -04:00
Limit.hs use filepath-bytestring for annex object manipulations 2019-12-11 15:25:07 -04:00
Logs.hs annex.tune.branchhash1=true bugfix 2020-02-14 15:22:48 -04:00
Makefile Makefile: Really move the fish completion to the vendor_completions.d directory. 2020-02-04 12:10:09 -04:00
Messages.hs handle git-credential prompt in -J mode 2020-01-22 16:42:15 -04:00
NEWS remove UNRELEASED marker 2019-11-07 13:20:28 -04:00
README use https 2014-11-06 14:20:10 -04:00
Remote.hs all commands building except for assistant 2019-12-05 14:41:18 -04:00
Setup.hs Added git-remote-tor-annex, which allows git pull and push to the tor hidden service. 2016-11-21 17:27:38 -04:00
stack-lts-12.14.yaml add filepath-bytestring 2019-12-27 15:20:46 -04:00
stack.yaml adjust filepath-bytestring deps 2019-12-30 11:43:15 -04:00
Test.hs separate RemoteConfig parsing basically working 2020-01-14 12:35:08 -04:00
Types.hs update licenses from GPL to AGPL 2019-03-13 15:48:14 -04:00
Upgrade.hs convert TopFilePath to use RawFilePath 2019-12-09 15:07:21 -04:00

git-annex allows managing files with git, without checking the file
contents into git. While that may seem paradoxical, it is useful when
dealing with files larger than git can currently easily handle, whether due
to limitations in memory, checksumming time, or disk space.

For documentation, see doc/ or <https://git-annex.branchable.com/>