Rename a branch git branch -m <old-name> <new-name> Change base branch git rebase --onto <target> <current-base> <your-branch> Checkout (add) a file/folder from a different branch git checkout <other-branch-name> -- path/to/your/folder