Cli aside there are some good tools out there that let you do this with a gui. I personally like GitKraken.