After re-reading your comment, one additional note. Line/hunk reverting is supported. I think it could stand improvement with regard to amending commits, tho!