Git update to newer tag - How to?

Question

I have cloned the DWM repository ( http://dwm.suckless.org ) and I want to use the stable version of DWM (currently 6.0) at all times. I maintain my personal changes in my a branch.

This is what I've done so far:

git clone git://git.suckless.org/dwm
cd dwm
git checkout -b mybranch 6.0
<apply cusomisations: several commits>

• Assuming my approach is correct so far, suppose version 6.1 is released and I want to update to 6.1, how do I go about that?

• Bonus question: If I already have a branch with the newest changes (not stable), what would I need to do to revert (without rewriting history) to tag 6.0 and keep my own commits?

Answer 1

To switch to another tag just:

git checkout 6.1

About 6.1 is released, do you need to merge changes or totally switching?