GitHub PR & git squash & git merge All In One

GitHub PR & git squash & git merge All In One

GitHub 上 merge PR 时合并多个 commits 提交 ✅

Github PR 时合并多次提交的 commits All In One

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

demos

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

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

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

github squash and merge vs rebase and merge

关于拉取请求合并

压缩与合并拉取请求提交
变基与合并拉取请求提交

您可以通过将所有提交保留在功能分支中、将所有提交压缩到一个提交中，或者将个别提交从“头部分支”变基为“基本”分支，以合并拉取请求。

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

stackoverflow

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

$ git rebase -i HEAD~3
# This will open the text editor and you must switch the 'pick' in front of each commit with 'squash' if you would like these commits to be merged together. From documentation:

# p, pick = use commit
# s, squash = use commit, but meld into previous commit

$ git push -f

$ git reset --soft HEAD~3

$ git commit -m "new commit message"

$ git push -f

$ git reset --hard HEAD~3

# git merge --squash
$ git merge --squash HEAD@{1}

$ git commit -m ""

"squash" git alias

# ~/.gitconfig
[alias]
    squash = "!f(){ git reset --soft HEAD~${1} && git commit --edit -m\"$(git log --format=%B --reverse HEAD..HEAD@{1})\"; };f"

git squash N

https://stackoverflow.com/questions/14534397/squash-all-my-commits-into-one-for-github-pull-request

https://stackoverflow.com/questions/5189560/how-do-i-squash-my-last-n-commits-together

refs

Github PR 时合并多次提交的 git commits All In One

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

---

---

©xgqfrms 2012-2021

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

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

---