diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2018-02-22 14:25:32 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-02-22 14:25:32 -0400 |
| commit | e1e17f4267576b3dcbeac619b43bc4de2f1c00a5 (patch) | |
| tree | 3c128ef381efe8a9133428146594128d0f2d770c /CHANGELOG | |
| parent | 1e98283d31b2e291a9627ea5e025af4ba4cd63a4 (diff) | |
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.
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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 <id@joeyh.name> Wed, 24 Jan 2018 20:42:55 -0400 |