comparison: docs/src/pull.md
docs/src/pull.md
- changeset 282
- 3070d72f54af
- parent 273
- c743721d566f
- child 283
- 0e36bb75a732
equal
deleted
inserted
replaced
| 281:ddb5e8f2a43d | 282:3070d72f54af |
|---|---|
| 3 | 3 |
| 4 **`pull [-cld] <directory>`** | 4 **`pull [-cld] <directory>`** |
| 5 | 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. | 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 | 7 |
| 8 When a trash directory is configured for the SyncDirectory, all files that should be deleted are moved to the trash directory. | 8 When a trash directory is configured for the SyncDirectory, all files that would be deleted are instead moved to the trash directory. |
| 9 | 9 |
| 10 When backup-on-pull is enabled for the SyncDirectory, all files that should be overridden are moved to the trash. | 10 When backup-on-pull is enabled for the SyncDirectory, all files that would be overwritten are also moved to the trash. |
| 11 | 11 |
| 12 **`-c`** Disable conflict detection. This always overrides locally modified files | 12 **`-c`** Disable conflict detection. This always overwrites locally modified files |
| 13 | 13 |
| 14 **`-l`** Lock the repository before accessing it. After `pull` completed, the repository is unlocked | 14 **`-l`** Lock the repository before accessing it. After `pull` completed, the repository is unlocked |
| 15 | 15 |
| 16 **`-d`** Don't lock the repository | 16 **`-d`** Don't lock the repository (default) |
| 17 | 17 |
| 18 | 18 |
