I was taught that either way is ok. The objective on short field is to accelerate to Vx as quickly as possible, which means getting off the ground as quickly as possible but keeping the angle of attack low enough to accelerate rapidly.
Two notches is the POH procedure (at least in Hershey...