summaryrefslogtreecommitdiff
path: root/doc/git-annex-config.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-06-01 12:46:36 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-06-01 12:51:01 -0400
commitde8f6959d3cd4af348e7a72c45e6e1d6d3cd4cfa (patch)
treef63493430204d764d84a44a909f68b778b719716 /doc/git-annex-config.mdwn
parent5c058d99a26da3639afcbf855eb7b6ca3d628fb3 (diff)
configuration to disable automatic merge conflict resolution
* Added annex.resolvemerge configuration, which can be set to false to disable the usual automatic merge conflict resolution done by git-annex sync and the assistant. * sync: Added --no-resolvemerge option. Note that disabling merge conflict resolution is probably not a good idea in a direct mode repo or adjusted branch. Since updates to both are done outside the usual work tree, if it fails the tree is not left in a conflicted state, and it would be hard to manually resolve the conflict. Still, made annex.resolvemerge be supported in those cases for consistency. This commit was sponsored by Riku Voipio.
Diffstat (limited to 'doc/git-annex-config.mdwn')
-rw-r--r--doc/git-annex-config.mdwn6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/git-annex-config.mdwn b/doc/git-annex-config.mdwn
index 8b505cde3..bf24251d8 100644
--- a/doc/git-annex-config.mdwn
+++ b/doc/git-annex-config.mdwn
@@ -32,6 +32,12 @@ These settings can be overridden on a per-repository basis using
Set to false to prevent the git-annex assistant and git-annex sync
from automatically committing changes to files in the repository.
+* `annex.resolvemerge`
+
+ Set to false to prevent merge conflicts being automatically resolved
+ by the git-annex assitant, git-annex sync, git-annex merge,
+ and the git-annex post-receive hook.
+
* `annex.synccontent`
Set to true to make git-annex sync default to syncing content.