diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/pull.html --- a/docs/html/pull.html Sun Dec 15 16:54:05 2019 +0100 +++ b/docs/html/pull.html Sun Dec 15 17:00:46 2019 +0100 @@ -1,12 +1,20 @@ - - + + - - + + dav-sync pull - - + + +
@@ -26,6 +34,7 @@
  • remove
  • copy
  • move
    • +
  • rename
  • export
  • import
  • get-property
    • @@ -35,9 +44,19 @@
  • unlock
  • info
  • date
    • +
  • versioncontrol
    • +
  • list-versions
    • +
  • checkout
    • +
  • checkin
    • +
  • uncheckout
  • add-repository
  • remove-repository
  • list-repositories
    • +
  • repository-url
    • +
  • add-user
    • +
  • remove-user
    • +
  • edit-user
    • +
  • list-users
  • check-config
  • Configuration
    • @@ -53,11 +72,13 @@
  • pull
  • push
  • archive
    • -
  • list-conflicts
    • +
  • restore
    • +
  • list-conflicts
  • resolve-conflicts
  • delete-conflicts
  • trash-info
  • empty-trash
    • +
  • list-versions
  • add-tag
  • remove-tag
  • set-tags
    • @@ -74,16 +95,16 @@
    - +

    dav-sync pull [-cldr] [-t <tags>] <directory>

    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.

    When a trash directory is configured for the SyncDirectory, all files that would be deleted are instead moved to the trash directory.

    When backup-on-pull is enabled for the SyncDirectory, all files that would be overwritten are also moved to the trash.

    -c Disable conflict detection. This always overwrites locally modified files

    -l Lock the repository before accessing it. After pull completed, the repository is unlocked

    -

    -d Don't lock the repository (default)

    +

    -d Don’t lock the repository (default)

    -t <tags> Only sync files that match the tag filter expression

    -r Delete files not matching the tag filter