Joey Hess 09e73a3ab6 annex.merge-annex-branches ... Added annex.merge-annex-branches config setting which can be used to disable automatic merge of git-annex branches. I wonder if git-annex merge/sync/assistant should disable this setting? Not sure yet, so have not done so. May be that users will not set it in git config, but pass it via -c to commands that need it. Checking the config setting adds a very small overhead, but it's only checked once per command so should be insignificant. This commit was supported by the NSF-funded DataLad project.		2018-02-22 14:25:32 -04:00
..
ActionItem.hs	better dup key with -J fix	2017-10-17 18:48:53 -04:00
Availability.hs
Backend.hs	add KeyVariety type	2017-02-24 15:16:56 -04:00
BranchState.hs
CleanupActions.hs
Command.hs
Concurrency.hs
Creds.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
Crypto.hs
DeferredParse.hs
DesktopNotify.hs
Difference.hs
Distribution.hs	adeiu, MissingH	2017-05-16 01:03:52 -04:00
Export.hs	add ExportTree table to export db	2017-09-18 13:59:59 -04:00
FileMatcher.hs
GitConfig.hs	annex.merge-annex-branches	2018-02-22 14:25:32 -04:00
Group.hs
Key.hs	AssociatedFile newtype	2017-03-10 13:35:31 -04:00
KeySource.hs
LockCache.hs
Messages.hs	add --json-error-messages (not yet implemented)	2018-02-19 14:32:15 -04:00
MetaData.hs	metadata: Added --remove-all.	2017-09-28 12:36:10 -04:00
NumCopies.hs
RefSpec.hs	Some optimisations to string splitting code.	2017-01-31 19:06:22 -04:00
Remote.hs	split out Types.Export	2017-09-15 16:46:03 -04:00
ScheduledActivity.hs
StandardGroups.hs
StoreRetrieve.hs
Test.hs	Removed the testsuite build flag	2017-12-20 12:25:03 -04:00
Transfer.hs	reorg	2017-12-14 11:26:59 -04:00
TrustLevel.hs	git annex get from exports	2017-09-04 16:39:56 -04:00
UrlContents.hs
UUID.hs	implementation of peer-to-peer protocol	2016-11-17 18:30:50 -04:00
View.hs