X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/e2e42a01ba5a2258edf1510280bb83864a0c8748..6ac9ce9a46c911cbaa7f3d1c33f49f595373622d:/detect-renamed-lax.diff diff --git a/detect-renamed-lax.diff b/detect-renamed-lax.diff index 9314476..6d621ca 100644 --- a/detect-renamed-lax.diff +++ b/detect-renamed-lax.diff @@ -79,7 +79,7 @@ diff --git a/options.c b/options.c {"fuzzy", 'y', POPT_ARG_VAL, &fuzzy_basis, 1, 0, 0 }, {"no-fuzzy", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 }, {"no-y", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 }, -@@ -1955,8 +1959,14 @@ void server_options(char **args, int *argc_p) +@@ -1963,8 +1967,14 @@ void server_options(char **args, int *argc_p) args[ac++] = "--super"; if (size_only) args[ac++] = "--size-only"; @@ -108,7 +108,7 @@ diff --git a/rsync.yo b/rsync.yo --compare-dest=DIR also compare received files relative to DIR --copy-dest=DIR ... and include copies of unchanged files --link-dest=DIR hardlink to files in DIR when unchanged -@@ -1496,6 +1498,17 @@ the bf(--partial-dir) option, that directory will be used instead. These +@@ -1503,6 +1505,17 @@ the bf(--partial-dir) option, that directory will be used instead. These potential alternate-basis files will be removed as the transfer progresses. This option conflicts with bf(--inplace) and bf(--append).