git rebase 与 git merge 的区别是什么 All In One

git rebase 与 git merge 的区别是什么 All In One

1. git rebase
2. git merge
3. git squash
4. git amend

https://stackoverflow.com/questions/2427238/what-is-the-difference-between-merge-squash-and-rebase

https://matt-rickard.com/squash-merge-or-rebase

https://rietta.com/blog/github-merge-types/

https://developer.aliyun.com/article/652579

GitHub PR

git history

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges

1. old normal merge

$ git merge --no-ff

2. new squash merge

https://github.blog/2016-04-01-squash-your-commits/

https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-rebasing-for-pull-requests

refs

https://www.cnblogs.com/xgqfrms/p/16457911.html

pick => squash
amend

https://www.cnblogs.com/xgqfrms/p/16465388.html

https://www.cnblogs.com/xgqfrms/p/13282715.html

https://github.com/web-full-stack/git/pulls

https://github.com/learning-js-by-reading-source-codes/github-pr-code-review

https://github.com/xgqfrms/git

https://github.com/xgqfrms/frontend-interview-quetions-collection

---

---

©xgqfrms 2012-2020

www.cnblogs.com/xgqfrms 发布文章使用：只允许注册用户才可以访问！

原创文章，版权所有©️xgqfrms, 禁止转载 ️，侵权必究⚠️！

---