Answers for "git merge --no-ff"

1

git merge vs git merge --no-ff

By default git merge tries to execute a "fast-forward".
- default: Simply moves commits and shifts head of master to the front.
- --no-ff: Creates a merge commit instead.

--no-ff can be desirable if you want git to maintain a history of 
feature branches.
Posted by: Guest on September-22-2021
4

git revert merge

git revert -m 1 <merge-commit>
Posted by: Guest on March-05-2020
1

git revert pr merge

git revert -m 1 b76a5f1f5d3b323679e466a1a1d5f93c8828b269 (Commit Number)
Posted by: Guest on November-27-2019
0

git merge tag to branch and squash commits

git checkout master
git merge --squash tag
git commit
Posted by: Guest on May-07-2020

Browse Popular Code Answers by Language