git p does a --rebase instead of merge