So if I have branched from master, onto experimental, and made several experimental changes that I want to actually use, then I can simply type:
git merge master
git branch master
from the tip of my experimental branch, and master will be moved up to the tip of the tree?