diff options
Diffstat (limited to 'doc/git-annex-config.mdwn')
| -rw-r--r-- | doc/git-annex-config.mdwn | 6 |
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. |