Merge remote-tracking branch 'upstream/master'

This commit is contained in:
hc 2015-11-04 16:20:52 +08:00
commit 240e08bacb
390 changed files with 23279 additions and 1968 deletions

View file

@ -1,4 +1,4 @@
alias rsync-copy="rsync -av --progress -h"
alias rsync-move="rsync -av --progress -h --remove-source-files"
alias rsync-update="rsync -avu --progress -h"
alias rsync-synchronize="rsync -avu --delete --progress -h"
alias rsync-copy="rsync -avz --progress -h"
alias rsync-move="rsync -avz --progress -h --remove-source-files"
alias rsync-update="rsync -avzu --progress -h"
alias rsync-synchronize="rsync -avzu --delete --progress -h"