From e1e17f4267576b3dcbeac619b43bc4de2f1c00a5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 22 Feb 2018 14:25:32 -0400 Subject: 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. --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index c03db1f93..fdda10391 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -26,6 +26,8 @@ git-annex (6.20180113) UNRELEASED; urgency=medium log. * importfeed: Fix a failure when downloading with youtube-dl and the destination subdirectory does not exist yet. + * Added annex.merge-annex-branches config setting which + can be used to disable automatic merge of git-annex branches. -- Joey Hess Wed, 24 Jan 2018 20:42:55 -0400 -- cgit v1.2.3