[philippotto]

I had the same problem (once in a blue moon, sublime did the correct behavior, but overall it was pretty unreliable).

As a solution, I wrote a small ST package [1] which produces the desired behavior. The package listens on a socket to "open-file-requests", which can be issued from the command line.

Via bash aliasing, you can invoke something like `lsub myfile.txt` which will then do what you want.

However, I'm not too sure about whether it works for git, as it's probably not blocking (I didn't test it for this usecase). Maybe it's still useful for someone, though.

[1] https://github.com/philippotto/LocalSubl