Sat, 05 Aug 2017 13:35:27 +0200
more minor improvements to the documentation
273 | 1 | dav-sync pull |
2 | ============= | |
3 | ||
4 | **`pull [-cld] <directory>`** | |
5 | ||
6 | 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. | |
7 | ||
282
3070d72f54af
more minor improvements to the documentation
Mike Becker <universe@uap-core.de>
parents:
273
diff
changeset
|
8 | When a trash directory is configured for the SyncDirectory, all files that would be deleted are instead moved to the trash directory. |
273 | 9 | |
282
3070d72f54af
more minor improvements to the documentation
Mike Becker <universe@uap-core.de>
parents:
273
diff
changeset
|
10 | When backup-on-pull is enabled for the SyncDirectory, all files that would be overwritten are also moved to the trash. |
273 | 11 | |
282
3070d72f54af
more minor improvements to the documentation
Mike Becker <universe@uap-core.de>
parents:
273
diff
changeset
|
12 | **`-c`** Disable conflict detection. This always overwrites locally modified files |
273 | 13 | |
14 | **`-l`** Lock the repository before accessing it. After `pull` completed, the repository is unlocked | |
15 | ||
282
3070d72f54af
more minor improvements to the documentation
Mike Becker <universe@uap-core.de>
parents:
273
diff
changeset
|
16 | **`-d`** Don't lock the repository (default) |
273 | 17 | |
18 |