The only tricky move in combat and non-combat of the same unit is armor, really. Armor may blitz into and out of combat during the combat move phase. (Assuming the territory blitzed was empty.)
Other then that, “combat” ends all movement. (Aircraft exempted.)