Skip to content

Latest commit

 

History

History
66 lines (51 loc) · 1.25 KB

notes-1.md

File metadata and controls

66 lines (51 loc) · 1.25 KB

Webdev — Git 2018 p.1

INTRO

  • webdev
  • poll
  • obsah
  • git wtf/why
  • basic config

QUICK START

  • two ways of creation
  • status, log, diff
  • init, add, commit
  • commit (kocka lega, ukazuje na stav)
  • stage (+ gotchas)
  • gitignore basics
  • git log (again)
  • rm, mv
  • git show (more on deleting and changing commits later)
  • checkout
  • blame, reset
  • add -p !

QUICK START OPAKOVANIE (GUI)

  • gui/cli - uplne jedno je to to iste
  • changes -> stage -> commit
  • look at the changes
  • git clients poll (GH / GL / BB)

PAUZA

REMOTES + PUSH + PULL + GITHUB (p1)

  • clone repa z GH
  • opakovanie - changes -> stage -> commit
  • decentralized - fork na GH, remote add
  • push mine/origin
  • git hostings

BRANCHES + MERGES

  • branch wtf/why
  • git checkout -b new-branch
  • pushing branches
  • merging locally
  • merge requests
  • conflicts!

BEST PRACTICES (p1) + OPAKOVANIE

  • commit messages
  • commit contents
  • commit generated/config/secret/private files / gitignore
  • don't change published main origin branches
  • do not use git for deployments (but we'll see how that works)
  • aliases
  • opakovanie

REFERENCES