updated git sync to only "stash pop" if just "stashed"