Welcome to Git



author liuxd



刘喜东(东子)

PHP开发工程师

Summary

  • Complex and Powerful
  • Distributed and Fast

Concepts

  • sha1
  • branch
  • tag

Objects

  • commit
  • tree
  • blob

Space

  • Stash
  • Work Space
  • Index of Stage
  • Local Repositary
  • Upstream Repositary

Merge vs Rebase


Merge


Rebase

Conflicts when rebasing

  • git add [file]
  • git rebase --continue
  • git rebase --skip
  • git rebase --abort

Come & Go

  • fetch
  • pull
  • push
  • -f

Time goes back

  • reset
  • reflog

Ignore

  • .gitignore
  • syntax
  • take effect
  • caution

Git Flow

  • business branch
  • develop
  • master
  • hotfix

Resources

FAQ




come on!







Thx




Exam

Welcome to Git

By liuxd

Welcome to Git

  • 1,318