diff -r ddb5e8f2a43d -r 3070d72f54af docs/html/pull.html --- a/docs/html/pull.html Sat Aug 05 11:33:17 2017 +0200 +++ b/docs/html/pull.html Sat Aug 05 13:35:27 2017 +0200 @@ -67,11 +67,11 @@
pull [-cld] <directory>
Pulls all changes from the server. All new or modified files are downloaded and all files deleted on the server are deleted locally. If a file is also locally modified and conflict detection is not disabled, the local file is renamed and an entry in the conflict database is added.
-When a trash directory is configured for the SyncDirectory, all files that should be deleted are moved to the trash directory.
-When backup-on-pull is enabled for the SyncDirectory, all files that should be overridden are moved to the trash.
--c
Disable conflict detection. This always overrides locally modified files
When a trash directory is configured for the SyncDirectory, all files that would be deleted are instead moved to the trash directory.
+When backup-on-pull is enabled for the SyncDirectory, all files that would be overwritten are also moved to the trash.
+-c
Disable conflict detection. This always overwrites locally modified files
-l
Lock the repository before accessing it. After pull
completed, the repository is unlocked
-d
Don't lock the repository
-d
Don't lock the repository (default)