何时使用Git rebase而非Git merge

Git中Cherry - picking提交的含义及操作

Git refusing to merge unrelated histories on rebase