Meeting Plan.md

Meeting Topics

• Intro: Why Git?

  • Code versioning
  • Backup/restore of code
  • Collaboration

• Install chocolatey and run powershell script

• Configure Git

  • name and email address
  • diff/merge tool
  • Putty key
    • Generate
    • Import
    • Export public key to give to github or other places

• git signing

  • GPG Program

    git config --global gpg.program "C:\Program Files (x86)\GnuPG\bin\gpg.exe"

  • Generate key
  • Assign key id in git settings

    git config --global user.signingkey enter key id here

  • Set signing to automaticaly happen when committing

    git config --global commit.gpgsign true

• Create repo

• Set .gitignore

• Commit

  • Stage files
  • Message (50/72 rule)

• Stash

• Create branch

• Checkout

  • Branch
  • Commit (headless)

• Merge Branch

• Rebase Branch

• Merge conflict

• Reset

  • Files
  • Lines
  • Commit

• Remotes

  • Configure
    • Add putty key
  • Branch defaults
  • Push
  • Pull/Fetch