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

improve markup and man page rendering

Browse source
This commit is contained in:
Joey Hess 2019-09-18 12:34:40 -04:00
parent 1f467fa08f
commit 324d4a4d8c
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,14 +29,15 @@ These settings can be overridden on a per-repository basis using
* `annex.autocommit` * `annex.autocommit`
Set to false to prevent the git-annex assistant and git-annex sync Set to false to prevent the `git-annex assistant` and `git-annex sync`
from automatically committing changes to files in the repository. from automatically committing changes to files in the repository.
* `annex.resolvemerge` * `annex.resolvemerge`
Set to false to prevent merge conflicts in the checked out branch Set to false to prevent merge conflicts in the checked out branch
being automatically resolved by the git-annex assitant, being automatically resolved by the `git-annex assitant`,
git-annex sync, git-annex merge, and the git-annex post-receive hook. `git-annex sync`, `git-annex merge`, and the `git-annex post-receive`
hook.
* `annex.synccontent` * `annex.synccontent`
@ -45,15 +46,15 @@ These settings can be overridden on a per-repository basis using
* `annex.securehashesonly` * `annex.securehashesonly`
Set to true to indicate that the repository should only use Set to true to indicate that the repository should only use
cryptographically secure hashes cryptographically secure hashes (SHA2, SHA3) and not insecure
(SHA2, SHA3) and not insecure hashes (MD5, SHA1) for content. hashes (MD5, SHA1) for content.
When this is set, the contents of files using cryptographically When this is set, the contents of files using cryptographically
insecure hashes will not be allowed to be added to the repository. insecure hashes will not be allowed to be added to the repository.
Also, git-annex fsck` will complain about any files present in Also, `git-annex fsck` will complain about any files present in
the repository that use insecure hashes. the repository that use insecure hashes.
Note that this is only read from the git-annex branch by Note that this is only read from the git-annex branch by
`git annex init`, and is copied to the corresponding git config setting. `git annex init`, and is copied to the corresponding git config setting.
So, changes to the value in the git-annex branch won't affect a So, changes to the value in the git-annex branch won't affect a

8
doc/git-annex.mdwn
View file

@ -868,7 +868,7 @@ Like other git commands, git-annex is configured via `.git/config`.
the repository that use insecure hashes. the repository that use insecure hashes.
To configure the behavior in new clones of the repository, To configure the behavior in new clones of the repository,
this can be set in [[git-annex-config]]. this can be set using [[git-annex-config]].
* `annex.maxextensionlength` * `annex.maxextensionlength`
@ -1054,14 +1054,14 @@ Like other git commands, git-annex is configured via `.git/config`.
and the git-annex post-receive hook. and the git-annex post-receive hook.
To configure the behavior in all clones of the repository, To configure the behavior in all clones of the repository,
this can be set in [[git-annex-config]]. this can be set in [[git-annex-config]](1).
* `annex.synccontent` * `annex.synccontent`
Set to true to make git-annex sync default to syncing content. Set to true to make git-annex sync default to syncing content.
To configure the behavior in all clones of the repository, To configure the behavior in all clones of the repository,
this can be set in [[git-annex-config]]. this can be set in [[git-annex-config]](1).
* `annex.debug` * `annex.debug`
@ -1633,7 +1633,7 @@ Remotes are configured using these settings in `.git/config`.
from automatically committing changes to files in the repository. from automatically committing changes to files in the repository.
To configure the behavior in all clones of the repository, To configure the behavior in all clones of the repository,
this can be set in [[git-annex-config]]. this can be set in [[git-annex-config]](1).
* `annex.startupscan` * `annex.startupscan`