usrbinkat/squash-git.md

## squash-git.md

      
    Raw
  

              squash-git.md
            
          
    Clone repo & update with latest from upstream master

git clone https://github.com/CodeSparta/content.git    
git checkout master    
git remote add upstream https://github.com/ComplianceAsCode/content.git    
git fetch upstream master

Merge codesparta/content ref(sparta)

git checkout -b feature_kubeapi_cis_1-2-25
git merge --squash origin/sparta
git push origin feature_kubeapi_cis_1-2-25