double-fuzzy lets rsync check link-dest dir #1

Open

Ghost wants to merge 1 commit from spads-spads/main into main

Ghost commented

2021-12-02 12:37:09 +00:00

(Migrated from codeberg.org)

When using --link-dest, add --fuzzy, twice so that rsync checks for possible matches in the directory specified by --link-dest

When using `--link-dest`, add `--fuzzy`, twice so that rsync checks for possible matches in the directory specified by `--link-dest`

This pull request has changes conflicting with the target branch.

turku_storage/ping.py

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'double-fuzzy lets rsync check link-dest dir' (#1) from spads-spads/main into main

Merge commit body

Reviewed-on: https://forge.colobox.com/rfinnie/turku-storage/pulls/1

Merge pull request 'double-fuzzy lets rsync check link-dest dir' (#1) from spads-spads/main into main

Reviewed-on: https://forge.colobox.com/rfinnie/turku-storage/pulls/1

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin spads-spads/main:spads-spads/main

git switch spads-spads/main

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main

git merge --no-ff spads-spads/main

git switch spads-spads/main

git rebase main

git switch main

git merge --ff-only spads-spads/main

git switch spads-spads/main

git rebase main

git switch main

git merge --no-ff spads-spads/main

git switch main

git merge --squash spads-spads/main