From ed1d18d337b19af99fa2c757af9de2506ffbbc6b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 18 Sep 2019 12:14:45 -0400 Subject: [PATCH] clarify that annex.addunlocked does not affect git add --- doc/git-annex.mdwn | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 121e0d9477..127986710e 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -906,8 +906,11 @@ Like other git commands, git-annex is configured via `.git/config`. * `annex.addunlocked` Set to true to make commands like `git-annex add` that add files to the - repository add them in unlocked form. The default is to add files in - locked form. + repository add them in unlocked form. The default is for these commands + to add files in locked form. + + (Using `git add` always adds files in unlocked form and it is not + affected by this setting.) When a repository has core.symlinks set to false, it implicitly sets annex.addunlocked to true.