Merge remote-tracking branch 'refs/remotes/github/master'
This commit is contained in:
commit
7bfd92edb3
16
README.md
16
README.md
@ -118,6 +118,7 @@ So, if you want FAT format for its portability, we can tweak the rsync commands
|
|||||||
rsync -rtv --modify-window=1 <ORIGIN> <DESTINATION>
|
rsync -rtv --modify-window=1 <ORIGIN> <DESTINATION>
|
||||||
```
|
```
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
You can set this by changing the setting to "yes"
|
You can set this by changing the setting to "yes"
|
||||||
|
|
||||||
```
|
```
|
||||||
@ -125,6 +126,21 @@ set fat32 to "no"
|
|||||||
```
|
```
|
||||||
|
|
||||||
## What Does That Do?
|
## What Does That Do?
|
||||||
|
=======
|
||||||
|
You can set this by commenting this line (add a # to the beginning)
|
||||||
|
|
||||||
|
```
|
||||||
|
set rsync_command to "rsync -av --delete"
|
||||||
|
```
|
||||||
|
|
||||||
|
And in comment this one (remove the # at the begining of the line)
|
||||||
|
|
||||||
|
```
|
||||||
|
# set rsync_command to "rsync -rtv --modify-window=1"
|
||||||
|
```
|
||||||
|
|
||||||
|
## What does that do?
|
||||||
|
>>>>>>> refs/remotes/github/master
|
||||||
|
|
||||||
* **-r** recursive; go into any sub directories
|
* **-r** recursive; go into any sub directories
|
||||||
* **-t** times; preserve the modification times
|
* **-t** times; preserve the modification times
|
||||||
|
@ -47,8 +47,6 @@ else
|
|||||||
set rsync_command to "rsync -av --delete"
|
set rsync_command to "rsync -av --delete"
|
||||||
end if
|
end if
|
||||||
|
|
||||||
display alert rsync_command
|
|
||||||
|
|
||||||
# repeat rsync with all the folders set above
|
# repeat rsync with all the folders set above
|
||||||
|
|
||||||
repeat with theurl in myfolders
|
repeat with theurl in myfolders
|
||||||
|
Loading…
x
Reference in New Issue
Block a user