diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-12-15 14:07:54 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-15 14:07:54 -0400 |
| commit | 65b70a1164f69e198ef135e62bdc92e8c4332582 (patch) | |
| tree | 1507cfa7b3bed3bf4f1bd52b200285e025c05da4 /doc/git-annex-add.mdwn | |
| parent | 5a48c059b756b1ec51d34f8221a43972594952ab (diff) | |
update doc for v6
Diffstat (limited to 'doc/git-annex-add.mdwn')
| -rw-r--r-- | doc/git-annex-add.mdwn | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/doc/git-annex-add.mdwn b/doc/git-annex-add.mdwn index cfeb8a98e..2f95f5455 100644 --- a/doc/git-annex-add.mdwn +++ b/doc/git-annex-add.mdwn @@ -11,15 +11,21 @@ git annex add `[path ...]` Adds files in the path to the annex. If no path is specified, adds files from the current directory and below. -Normally, files that are already checked into git, or that git has been -configured to ignore will be silently skipped. +Files that are already checked into git and are unmodified, or that +git has been configured to ignore will be silently skipped. -If annex.largefiles is configured, and does not match a file that is being -added, `git annex add` will behave the same as `git add` and add the -non-large file directly to the git repository, instead of to the annex. +If annex.largefiles is configured, and does not match a file, `git annex +add` will behave the same as `git add` and add the non-large file directly +to the git repository, instead of to the annex. -This command can also be used to add symbolic links, both symlinks to -annexed content, and other symlinks. +Large files are added to the annex in locked form, which prevents further +modification of their content unless unlocked by [[git-annex-unlock]](1). +To add a file to the annex in unlocked form, `git add` can be used instead +(that only works when the repository has annex.version 6 or higher). + +Files that are not annexed files (including symbolic links and files +checked directly into git) will be staged in the index the same as if `git +add` were used. # OPTIONS |