PR 25 from dooblem/bsync: Batch mode, autoanswer and rsync arguments#3
Open
mikebentley15 wants to merge 1 commit intomikebentley15:masterfrom
Open
PR 25 from dooblem/bsync: Batch mode, autoanswer and rsync arguments#3mikebentley15 wants to merge 1 commit intomikebentley15:masterfrom
mikebentley15 wants to merge 1 commit intomikebentley15:masterfrom
Conversation
- Prevent "Apply actions?" question on batch mode - Added options "a" and "aa" for conflict resolution, which act as following: in case of deletion on one side, and update on another side, choose sync of updated file instead of deletion of removed file; in case of updated file in both sides, privilege the most recent file; in other cases, give precedence to left side - Added command line option -r to specify additional rsync arguments (useful for adding --acls and --xattr options) - Added argument to command line option -b, with which is possible to specify the default action in case of conflict: 1, 2, a or e for exit
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Original pull request on dooblem/bsync