dir merge

10up · Sep 16, 2024 · 488a537 · 488a537
1 parent d14eb77
commit 488a537
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/deploy.sh b/deploy.sh
@@ -99,7 +99,7 @@ if [[ "$BUILD_DIR" = false ]]; then
 		# The --filter flag will allow the full .gitignore syntax to be used in .distignore
 		# The --delete flag will delete anything in destination that no longer exists in source
 		# rsync -rc --filter="dir-merge,- $GITHUB_WORKSPACE/.distignore" "$GITHUB_WORKSPACE/" trunk/ --delete --delete-excluded
-		rsync -rcv --filter="merge $GITHUB_WORKSPACE/.distignore" "$GITHUB_WORKSPACE/" trunk/ --delete --delete-excluded --itemize-changes
+		rsync -rcv --filter="dir-merge $GITHUB_WORKSPACE/.distignore" "$GITHUB_WORKSPACE/" trunk/ --delete --delete-excluded --itemize-changes
 	else
 		echo "ℹ︎ Using .gitattributes"