justin-lyon/git-cheatsheet.md

## git-cheatsheet.md

      
    Raw
  

              git-cheatsheet.md
            
          
Sum [dev] branch revisions into a single merge commit on [target] branch (Like Pull Request)

git checkout [target]
git pull
git merge [dev] --no-ff -m "message"
git push


Cherry Pick

// One commit
git checkout [targetBranch] 
git cherry-pick <srcCommitHash>

// squash range of commits
git checkout [targetBranch]

// two separate commits
git cherry-pick -n <srcCommitHash1> <srcCommitHash2>
// or a range from commit 1 to commit 3
git cherry-pick -n <srcCommitHash1>..<srcCommitHash3>

git add .
git commit -m "message"
git push