robrez/gitnotes.md

## gitnotes.md

      
    Raw
  

              gitnotes.md
            
          
    #squash commits / rebase or merge
##If needed add upstream
git remote -v
git remote add upstream https://github.com/repo/project.git
git fetch upstream
git rebase upstream/master
git rebase --interactive HEAD~2
#note: per stackoverflow "git pull --rebase upstream master is analogous to git fetch upstream && git rebase upstream/master"

##Squashing
#  we are going to squash c into b 
pick b76d157 b
pick a931ac7 c

# squash c into b
pick b76d157 b
s a931ac7 c