I don't think that --squash on the initial 'add' will work