mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

improve documentation of overridding git-annex config with gitconfig

Browse source
This commit is contained in:
Joey Hess 2022-03-29 15:03:57 -04:00
parent bc6d64ec8a
commit 3ab1619804
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
doc/git-annex-config.mdwn
View file

@ -67,6 +67,9 @@ looks for these.
Set to false to prevent the `git-annex assistant` and `git-annex sync`
from automatically committing changes to files in the repository.
This sets a default, which can be overridden by annex.autocommit
in `git config`.
* `annex.resolvemerge`
Set to false to prevent merge conflicts in the checked out branch
@ -74,15 +77,24 @@ looks for these.
`git-annex sync`, `git-annex merge`, and the `git-annex post-receive`
hook.
This sets a default, which can be overridden by annex.resolvemerge
in `git config`.
* `annex.synccontent`
Set to true to make git-annex sync default to syncing annexed content.
This sets a default, which can be overridden by annex.synccontent
in `git config`.
* `annex.synconlyannex`
Set to true to make git-annex sync default to only sync the git-annex
branch and annexed content.
This sets a default, which can be overridden by annex.synconlyannex
in `git config`.
* `annex.securehashesonly`
Set to true to indicate that the repository should only use