comparison: docs/html/pull.html
docs/html/pull.html
- changeset 273
- c743721d566f
- child 282
- 3070d72f54af
equal
deleted
inserted
replaced
| 272:b321a3be0a38 | 273:c743721d566f |
|---|---|
| 1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | |
| 2 <html xmlns="http://www.w3.org/1999/xhtml"> | |
| 3 <head> | |
| 4 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> | |
| 5 <meta http-equiv="Content-Style-Type" content="text/css" /> | |
| 6 <meta name="generator" content="pandoc" /> | |
| 7 <title></title> | |
| 8 <style type="text/css">code{white-space: pre;}</style> | |
| 9 <link rel="stylesheet" href="davdoc.css" type="text/css" /> | |
| 10 </head> | |
| 11 <body> | |
| 12 <div class="header"> | |
| 13 <span>davutils documentation</span> | |
| 14 </div> | |
| 15 <div class="sidebar"> | |
| 16 <div class="nav"> | |
| 17 <h3>dav</h3> | |
| 18 <ul> | |
| 19 <li><a href="getting-started.html">Getting started</a></li> | |
| 20 <li><a href="commands.html">Commands</a></li> | |
| 21 <ul> | |
| 22 <li><a href="list.html">list</a></li> | |
| 23 <li><a href="get.html">get</a></li> | |
| 24 <li><a href="put.html">put</a></li> | |
| 25 <li><a href="mkdir.html">mkdir</a></li> | |
| 26 <li><a href="remove.html">remove</a></li> | |
| 27 <li><a href="copy.html">copy</a></li> | |
| 28 <li><a href="move.html">move</a></li> | |
| 29 <li><a href="get-property.html">get-property</a></li> | |
| 30 <li><a href="set-property.html">set-property</a></li> | |
| 31 <li><a href="lock.html">lock</a></li> | |
| 32 <li><a href="unlock.html">unlock</a></li> | |
| 33 <li><a href="info.html">info</a></li> | |
| 34 <li><a href="date.html">date</a></li> | |
| 35 <li><a href="add-repository.html">add-repository</a></li> | |
| 36 <li><a href="list-repositories.html">list-repositories</a></li> | |
| 37 <li><a href="check-config.html">check-config</a></li> | |
| 38 </ul> | |
| 39 <li><a href="configuration.html">Configuration</a></li> | |
| 40 <li><a href="encryption.html">Encryption</a></li> | |
| 41 </ul> | |
| 42 </div> | |
| 43 <div class="nav"> | |
| 44 <h3>dav-sync</h3> | |
| 45 <ul> | |
| 46 <li><a href="introduction.html">Introduction</a></li> | |
| 47 <li><a href="sync-commands.html">Commands</a></li> | |
| 48 <ul> | |
| 49 <li><a href="pull.html">pull</a></li> | |
| 50 <li><a href="push.html">push</a></li> | |
| 51 <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> | |
| 52 <li><a href="delete-conflicts.html">delete-conflicts</a></li> | |
| 53 <li><a href="trash-info.html">trash-info</a></li> | |
| 54 <li><a href="empty-trash.html">empty-trash</a></li> | |
| 55 <li><a href="add-directory.html">add-directory</a></li> | |
| 56 <li><a href="list-directories.html">list-directories</a></li> | |
| 57 <li><a href="sync-check-config.html">check-config</a></li> | |
| 58 <li><a href="check-repositories.html">check-repositories</a></li> | |
| 59 </ul> | |
| 60 <li><a href="sync-configuration.html">Configuration</a></li> | |
| 61 </ul> | |
| 62 </div> | |
| 63 </div> | |
| 64 | |
| 65 <!-- begin content --> | |
| 66 <div class="content"> | |
| 67 <h1 id="dav-sync-pull">dav-sync pull</h1> | |
| 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> | |
| 70 <p>When a trash directory is configured for the SyncDirectory, all files that should be deleted are 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> | |
| 72 <p><strong><code>-c</code></strong> Disable conflict detection. This always overrides 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> | |
| 74 <p><strong><code>-d</code></strong> Don't lock the repository</p> | |
| 75 </div> | |
| 76 <!-- end content --> | |
| 77 </body> | |
| 78 </html> |
