docs/html/delete-conflicts.html@7954fdacdb5c (annotated)
docs/html/delete-conflicts.html
Tue, 12 Dec 2017 17:41:01 +0100
- author
- Olaf Wintermann <olaf.wintermann@gmail.com>
- date
- Tue, 12 Dec 2017 17:41:01 +0100
- branch
- v1.1
- changeset 341
- 7954fdacdb5c
- parent 320
- 12ed560c926c
- child 429
- 1607450065ba
- permissions
- -rw-r--r--
enable va_list fix only on mingw (this is the real release, as usual)
| 273 | 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" /> | |
|
283
0e36bb75a732
adds dav-sync introduction and sync.xml documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
281
diff
changeset
|
7 | <title>dav-sync delete-conflicts</title> |
| 273 | 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"> | |
|
285
02d3e4b1245f
adds some small fixes for 1.0 release
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
283
diff
changeset
|
13 | <a href="./index.html"><span>DavUtils documentation</span></a> |
| 273 | 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> | |
|
320
12ed560c926c
adds documentation for new features
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
285
diff
changeset
|
31 | <li><a href="remove-property.html">remove-property</a></li> |
| 273 | 32 | <li><a href="lock.html">lock</a></li> |
| 33 | <li><a href="unlock.html">unlock</a></li> | |
| 34 | <li><a href="info.html">info</a></li> | |
| 35 | <li><a href="date.html">date</a></li> | |
| 36 | <li><a href="add-repository.html">add-repository</a></li> | |
| 37 | <li><a href="list-repositories.html">list-repositories</a></li> | |
| 38 | <li><a href="check-config.html">check-config</a></li> | |
| 39 | </ul> | |
| 40 | <li><a href="configuration.html">Configuration</a></li> | |
| 41 | <li><a href="encryption.html">Encryption</a></li> | |
| 42 | </ul> | |
| 43 | </div> | |
| 44 | <div class="nav"> | |
| 45 | <h3>dav-sync</h3> | |
| 46 | <ul> | |
| 47 | <li><a href="introduction.html">Introduction</a></li> | |
| 48 | <li><a href="sync-commands.html">Commands</a></li> | |
| 49 | <ul> | |
| 50 | <li><a href="pull.html">pull</a></li> | |
| 51 | <li><a href="push.html">push</a></li> | |
|
320
12ed560c926c
adds documentation for new features
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
285
diff
changeset
|
52 | <li><a href="archive.html">archive</a></li> |
| 273 | 53 | <li><a href="resolve-conflicts.html">resolve-conflicts</a></li> |
| 54 | <li><a href="delete-conflicts.html">delete-conflicts</a></li> | |
| 55 | <li><a href="trash-info.html">trash-info</a></li> | |
| 56 | <li><a href="empty-trash.html">empty-trash</a></li> | |
| 57 | <li><a href="add-directory.html">add-directory</a></li> | |
| 58 | <li><a href="list-directories.html">list-directories</a></li> | |
| 59 | <li><a href="sync-check-config.html">check-config</a></li> | |
| 60 | <li><a href="check-repositories.html">check-repositories</a></li> | |
| 61 | </ul> | |
| 62 | <li><a href="sync-configuration.html">Configuration</a></li> | |
| 63 | </ul> | |
| 64 | </div> | |
| 65 | </div> | |
| 66 | ||
| 67 | <!-- begin content --> | |
| 68 | <div class="content"> | |
|
283
0e36bb75a732
adds dav-sync introduction and sync.xml documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
281
diff
changeset
|
69 | <div id="header"> |
|
0e36bb75a732
adds dav-sync introduction and sync.xml documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
281
diff
changeset
|
70 | <h1 class="title">dav-sync delete-conflicts</h1> |
|
0e36bb75a732
adds dav-sync introduction and sync.xml documentation
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
281
diff
changeset
|
71 | </div> |
|
285
02d3e4b1245f
adds some small fixes for 1.0 release
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
283
diff
changeset
|
72 | <p><strong><code>dav-sync delete-conflicts <directory></code></strong></p> |
|
281
ddb5e8f2a43d
some more minor doc improvements
Mike Becker <universe@uap-core.de>
parents:
275
diff
changeset
|
73 | <p>Deletes all files that are marked as a conflict. This will always delete the files and does not move them to the trash directory.</p> |
| 273 | 74 | </div> |
| 75 | <!-- end content --> | |
| 76 | </body> | |
| 77 | </html> |
