If GUI is your thing, I recommend giving Sublime Merge a look. I absolutely love it. I've heard that there are similarities to Magit in the terms of capabilities, e.g. staging (or reverting) by line.