Git - rebase

About

rebase is designed (as merge) to integrate changes from one branch into another branch.

php dev use rebase to update regularly from master

git checkout feature/featurename
git rebase master

and use merge (forward) once the branch is accepted.

git checkout master
git merge --ff-only feature/featurename

Configuration

Automatic rebase of a branch before a pull request

git config branch.autosetuprebase local

Documentation / Reference


Powered by ComboStrap