From f79bd5213248cd1f9c77189408242dc7a5f177e3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 20 Dec 2019 13:19:36 -0400 Subject: [PATCH] improve docs of addunlocked re adjusted branches --- doc/git-annex.mdwn | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index f3e4f6efb9..0e83c6631f 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -927,13 +927,14 @@ Like other git commands, git-annex is configured via `.git/config`. Set to true to make commands like `git-annex add` that add files to the repository add them in unlocked form. The default is for these commands - to add files in locked form. + 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. + When a repository has core.symlinks set to false, or has an adjusted + unlocked branch checked out, this setting is ignored, and files are + always added to the repository in unlocked form. * `annex.numcopies`