Skip to content

Instantly share code, notes, and snippets.

View BOVAGE's full-sized avatar
🎯
Focusing

Fayemi Boluwatife BOVAGE

🎯
Focusing
49 followers · 38 following
View GitHub Profile
@whoisryosuke
whoisryosuke / Update-branch.md
Created September 17, 2019 17:38 — forked from santisbon/Update-branch.md
Bring your feature branch up to date with master. Deploying from Git branches adds flexibility. Bring your branch up to date with master and deploy it to make sure everything works. If everything looks good the branch can be merged. Otherwise, you can deploy your master branch to return production to its stable state.

Updating a feature branch

First we'll update your local master branch. Go to your local project and check out the branch you want to merge into (your local master branch)

$ git checkout master

Fetch the remote, bringing the branches and their commits from the remote repository. You can use the -p, --prune option to delete any remote-tracking references that no longer exist in the remote. Commits to master will be stored in a local branch, remotes/origin/master




  


  




    


          
    

      

        
        

          

              @trongthanh
          

          

            
                trongthanh
                / gist:2779392
            
            

              Last active
              September 8, 2024 09:15
            

              
                How to move a folder from one repo to another and keep its commit history
              
          

        

      

        

  

    
    


        



  


  

        

          
          # source: http://st-on-it.blogspot.com/2010/01/how-to-move-folders-between-git.html
        

        

          
          # First of all you need to have a clean clone of the source repository so we didn't screw the things up.
        

        

          
          

        

        

          
          git clone git://server.com/my-repo1.git
        

        

          
          

        

        

          
          # After that you need to do some preparations on the source repository, nuking all the entries except the folder you need to move. Use the following command
        

        

          
          

        

        

          
          git filter-branch --subdirectory-filter your_dir -- -- all
        

        

          
          

        

        

          
          # This will nuke all the other entries and their history, creating a clean git repository that contains only data and history from the directory you need. If you need to move several folders, you have to collect them in a single directory using the git mv command.