I would check out SmartGit, it should do everything you want. It's available on not only on Linux but Windows and Macs as well. It's pretty easy to use and is free for non-commercial projects.
#SmartGit (free*)
SmartGit (free*)
SmartGit is a front-end for the distributed version control system Git and runs on Windows, Mac OS X and Linux. SmartGit is intended for developers who prefer a graphical user interface over a command line client, to be even more productive with Git — the most powerful DVCS today.
* For non-commercial work