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 /doc/git-annex.mdwn | |
| 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 'doc/git-annex.mdwn')
| -rw-r--r-- | doc/git-annex.mdwn | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 684e5c60a..db8cfca61 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -974,6 +974,15 @@ Here are all the supported configuration settings. since it could garbage collect objects that are staged in git-annex's index but not yet committed. +* `annex.merge-annex-branches` + + By default, git-annex branches that have been pulled from remotes + are automatically merged into the local git-annex branch, so that + git-annex has the most up-to-date possible knowledge. + + To avoid that merging, set this to "false". This can be useful + particularly when you don't have write permission to the repository. + * `annex.hardlink` Set this to `true` to make file contents be hard linked between the @@ -1054,8 +1063,9 @@ Here are all the supported configuration settings. * `annex.resolvemerge` - Set to false to prevent merge conflicts being automatically resolved - by the git-annex assitant, git-annex sync, git-annex merge, + Set to false to prevent merge conflicts in the checked out branch + 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, |