Comment Re:git-annex - "The Nomad" use case (Score 5, Informative) 239
I've been using git-annex for this kind of synchronization for a while and have found it works quite well. It supports interrupted file transfers (via rsync), automatically keeps hashes of all your content, and lets you work offline effecively. git-annex is particularly good at synchronizing file renames between two machines: it actually tracks the renames so you won't have to re-upload anything like you would with rsync. It also supports more than one machine, if you want to make backups.
I would definately recommend trying it.