Skip to content
Permalink
Branch: master
Find file Copy path
Find file Copy path
Fetching contributors…
Cannot retrieve contributors at this time
110 lines (78 sloc) 1.18 KB

GIT




Init AB

Jonas Linde <jonas@init.se>

Background

  • for the Linux kernel
  • speed
  • distributed
  • cheap merges
  • BitKeeper is doing it right
  • CVS anv Subversion is doing it wrong

Objects

  • files (blob)
  • directories (tree)
  • commits
  • tags

Data flow

[Git Data Transport]

  • working directory = HEAD + uncommited changes
  • index = staged files

Remotes

  • clone
  • remote add
  • fetch
  • pull
  • push

Work flow

  • pull
  • fetch + merge
  • fast-forward
  • change files
  • add/rm/mv/stage
  • commit
  • push

Branches

[Branches]

  • branch
  • tag
  • checkout

Conflicts

  • merge
  • fix
  • add
  • commit
You can’t perform that action at this time.