templates / branches--on commit Teach git-pull to pass -X<option> to git-merge (ee2c795)
   1: this is just to ensure the directory exists.