templates / branches--on commit git-am: propagate --3way options as well (22db240)
   1: this is just to ensure the directory exists.