git is confusing, help!