Comment by Artlav

Git, without a question. There is the TortoiseGit on Windows which makes Git USABLE. On *nix there is nothing even remotely as good, unfortunately.