Mikhail Osher

// получаем последние изменения
git checkout master
git pull origin master

// вливаем их к себе
git checkout feature
git merge --no-ff master

git branch -m old_branch new_branch         # Rename branch locally    
git push origin :old_branch                 # Delete the old branch    
git push -u origin new_branch   # Push the new branch, set local branch to track the new remote

- gitroot
-- dir1
--- subdir11
--- subdir12
-- dir2
--- subdir21
--- subdir22