Git out of confusing situation