diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-12-07 14:32:25 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-12-07 14:32:25 -0400 |
| commit | 9350f8871f5498a34c99bed209799b9fbb6391d3 (patch) | |
| tree | 369db25e472126dbea8feeb7ec70dbca404da66c /doc/git-annex-add.mdwn | |
| parent | 51b648ac6e11d0d5a9e617e45d236bd850894285 (diff) | |
| parent | 3500fa70e016459fcd02cba4d4c3059e7f4555ef (diff) | |
Merge branch 'master' into tor
Diffstat (limited to 'doc/git-annex-add.mdwn')
| -rw-r--r-- | doc/git-annex-add.mdwn | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/git-annex-add.mdwn b/doc/git-annex-add.mdwn index b65ed5132..15bb8a6a0 100644 --- a/doc/git-annex-add.mdwn +++ b/doc/git-annex-add.mdwn @@ -15,9 +15,9 @@ If no path is specified, adds files from the current directory and below. 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, `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. Large files are added to the annex in locked form, which prevents further modification of their content unless unlocked by [[git-annex-unlock]](1). |