Once you have set an up-stream branch git will do the right thing (DWIM).