rob git cheatsheet

rob-git-cheatsheet.md

Cloning

• git clone --recursive <repo> <the-name-you-want-for-repo-directory>

Set up production remote

• git remote add production <production-repo-url>

Updating

• git add . -A
• git commit -am 'message'
• git pull -r origin master
  • error:
  • git rebase --abort
  • git pull origin master
  • error:
    • git mergetool
    • Use kaleidoscope to merge. hit command + s to save, command + q to quit.
    • git add . -A
    • git commit -am 'fixing conflicts'
• git push origin master
• git push production master