comparison: docs/html/pull.html
docs/html/pull.html
- changeset 282
- 3070d72f54af
- parent 273
- c743721d566f
- child 283
- 0e36bb75a732
equal
deleted
inserted
replaced
| 281:ddb5e8f2a43d | 282:3070d72f54af |
|---|---|
| 65 <!-- begin content --> | 65 <!-- begin content --> |
| 66 <div class="content"> | 66 <div class="content"> |
| 67 <h1 id="dav-sync-pull">dav-sync pull</h1> | 67 <h1 id="dav-sync-pull">dav-sync pull</h1> |
| 68 <p><strong><code>pull [-cld] <directory></code></strong></p> | 68 <p><strong><code>pull [-cld] <directory></code></strong></p> |
| 69 <p>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.</p> | 69 <p>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.</p> |
| 70 <p>When a trash directory is configured for the SyncDirectory, all files that should be deleted are moved to the trash directory.</p> | 70 <p>When a trash directory is configured for the SyncDirectory, all files that would be deleted are instead moved to the trash directory.</p> |
| 71 <p>When backup-on-pull is enabled for the SyncDirectory, all files that should be overridden are moved to the trash.</p> | 71 <p>When backup-on-pull is enabled for the SyncDirectory, all files that would be overwritten are also moved to the trash.</p> |
| 72 <p><strong><code>-c</code></strong> Disable conflict detection. This always overrides locally modified files</p> | 72 <p><strong><code>-c</code></strong> Disable conflict detection. This always overwrites locally modified files</p> |
| 73 <p><strong><code>-l</code></strong> Lock the repository before accessing it. After <code>pull</code> completed, the repository is unlocked</p> | 73 <p><strong><code>-l</code></strong> Lock the repository before accessing it. After <code>pull</code> completed, the repository is unlocked</p> |
| 74 <p><strong><code>-d</code></strong> Don't lock the repository</p> | 74 <p><strong><code>-d</code></strong> Don't lock the repository (default)</p> |
| 75 </div> | 75 </div> |
| 76 <!-- end content --> | 76 <!-- end content --> |
| 77 </body> | 77 </body> |
| 78 </html> | 78 </html> |
