Gitflow

Install Gitflow on Ubuntu:

apt install git-flow

First run:

git flow init

Create a feature branch:

git flow feature start feature_name

Add, commit etc. as normal, then finish with:

git flow feature finish feature_name