After following baur's response for this question: git rebase merge conflict
When I execute
git merge --ff $(git commit-tree temp^{tree} -m "Fix after rebase" -p HEAD)
I got the following error "unknown switch `p'
but I don't know which param should I use in this case
