diff options
Diffstat (limited to 'doc/git-annex.mdwn')
| -rw-r--r-- | doc/git-annex.mdwn | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 8a841a941..99f6c9076 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -1040,6 +1040,15 @@ Here are all the supported configuration settings. To configure the behavior in all clones of the repository, this can be set in [[git-annex-config]]. +* `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. + + To configure the behavior in all clones of the repository, + this can be set in [[git-annex-config]]. + * `annex.synccontent` Set to true to make git-annex sync default to syncing content. |