git, but if you come from svn and have no clue about git, run mercurial as it has a similar ui.