[quote]you modify a line and only want to stage half of the changes you did to that line.[/quote] By 'staging' I'm assuming you mean 'committing'... why would you only commit half the changes you did to a line? [quote]The latter case is far more important to me because I care quite a bit about whether my commit messages are consistent and work regardless of whether you're using a terminal or not. [/quote] Why care if you're of the opinion that everyone should be using a terminal in the first place? This post is from -- http://socoder.net/index.php?topic=2887