在本地dev分支merge 本地master分支：
@wooluwalkerdeMacBook-Pro:wenjian (dev)]$ git merge master Updating b1777d8..a565481 Fast-forward README.md | 1 + 1 file changed, 1 insertion(+) [@wooluwalkerdeMacBook-Pro:wenjian (dev)]$ git dog * a565481 (HEAD -> dev, origin/master, origin/HEAD, master) Update README.md * 19cfeea 第一次将远程dev分支代码合并到master分支Merge branch ‘dev‘ |\ | * b1777d8 (origin/dev) commit merge_excel_utils | * ee37473 manage utils | * 0b6e16c commit files * | 441940f 添加项目说明 |/ * 0f1f9d7 Initial Commit
rebase本地dev分支为本地master分支的最新commit状态
[@wooluwalkerdeMacBook-Pro:wenjian (dev)]$ git dog * 217fef2 (origin/master, origin/HEAD, master) Update README.md,添加日期 * a565481 (HEAD -> dev, origin/dev) Update README.md * 19cfeea 第一次将远程dev分支代码合并到master分支Merge branch ‘dev‘ |\ | * b1777d8 commit merge_excel_utils | * ee37473 manage utils | * 0b6e16c commit files * | 441940f 添加项目说明 |/ * 0f1f9d7 Initial Commit [@wooluwalkerdeMacBook-Pro:wenjian (dev)]$ git rebase master First, rewinding head to replay your work on top of it... Fast-forwarded dev to master. [@wooluwalkerdeMacBook-Pro:wenjian (dev)]$ git dog * 217fef2 (HEAD -> dev, origin/master, origin/HEAD, master) Update README.md,添加日期 * a565481 (origin/dev) Update README.md * 19cfeea 第一次将远程dev分支代码合并到master分支Merge branch ‘dev‘ |\ | * b1777d8 commit merge_excel_utils | * ee37473 manage utils | * 0b6e16c commit files * | 441940f 添加项目说明 |/ * 0f1f9d7 Initial Commit
功能上讲，二者类似，但还是有区别。
至于，区别......【未完待续】
不能在公共分支上执行rebase
Git 基础 - rebase 和 merge 进行分支整合
原文：https://www.cnblogs.com/wooluwalker/p/12252944.html