Upgrade to Pro — share decks privately, control downloads, hide ads and more …

Make the code work for you with #Git

Tomas Jukin
November 08, 2012

Make the code work for you with #Git

Slides from my presentation on Java BootCamp #5 about Git.

Java BootCamp #5 took place in Hradec Králové at 8. 11. 2012

http://www.java-bootcamp.cz/cs/bootcamp-5

Tomas Jukin

November 08, 2012
Tweet

More Decks by Tomas Jukin

Other Decks in Technology

Transcript

  1. Why SCM? FTP sucks Mail sucks Dropbox sucks USB drive

    sucks We NEED to share code! ...and...
  2. Why SCM? FTP sucks Mail sucks Dropbox sucks USB drive

    sucks We NEED to share code! ...and... So?
  3. Which SCM? CVS is a history SVN is centralized Mercurial

    can’t rebase ... Today, we NEED to: ...and... be independant be productive work offline have backup grow
  4. Which SCM? CVS is a history SVN is centralized Mercurial

    can’t rebase ... Today, we NEED to: ...and... So? be independant be productive work offline have backup grow
  5. Workflow Working Copy Index (stage) Local Repo Remote Repo add

    commit push fetch pull or rebase merge Remote Local
  6. Workflow Working Copy Index (stage) Local Repo Remote Repo add

    commit push fetch pull or rebase merge Remote Local
  7. Workflow Working Copy Index (stage) Local Repo Remote Repo add

    commit push fetch pull or rebase checkout HEAD merge Remote Local
  8. Workflow Working Copy Index (stage) Local Repo Remote Repo add

    commit push fetch pull or rebase checkout HEAD merge Remote Local
  9. Workflow Working Copy Index (stage) Local Repo Remote Repo add

    remove commit push fetch pull or rebase checkout HEAD merge Remote Local
  10. Workflow Working Copy Index (stage) Local Repo Remote Repo remove

    push fetch pull or rebase checkout HEAD merge Remote Local add commit
  11. Workflow Working Copy Index (stage) Local Repo Remote Repo remove

    push fetch pull or rebase checkout HEAD merge Remote Local add commit commit -a
  12. Workflow Working Copy Index (stage) Local Repo Remote Repo remove

    push fetch pull or rebase checkout HEAD merge Remote Local add commit commit -a add -A
  13. Workflow Working Copy Index (stage) Local Repo Remote Repo remove

    push fetch pull or rebase checkout HEAD merge Remote Local add commit commit -a add -A ?
  14. Workflow Working Copy Index (stage) Local Repo Remote Repo remove

    push fetch pull or rebase checkout HEAD merge Remote Local add commit commit -a add -A ? status
  15. Creation (in code) git clone [email protected]/foo.git foo_dir cd foo_dir Local

    Repo mkdir foo_dir cd foo_dir git init ...or... clone url
  16. GUI Windows TortoiseGit - http://goo.gl/9Gfhn SmartGit - http://goo.gl/P8QqD MacOS GitX

    (L) - http://goo.gl/AMiqc Linux Choose yours - http://goo.gl/TebDq
  17. Next? Links Interactive Git Cheatsheet - http://goo.gl/8yMZY GitHub - http://github.com

    semver - http://semver.org git flow (about) - http://goo.gl/MAF6m git flow (CLI tool) - http://goo.gl/IbOJr