git中merge，rebase，cherry-pick，patch的联系与区别