git flow workshop

1. Git-flow
스마트한 브랜칭 전략과 릴리즈 관리

2. index
why?
install
git-flow?

3. Software Development
Life-Cycle
Planning Development Testing Release

4. Software Development
Life-Cycle
Target
Start

5. solo?
Target
Start
http://www.mongri.co.kr/xe/319

6. we are the team
Target
Start
http://www.mongri.co.kr/xe/319

7. go to hell
기능

8. 구현
기능

9. 구현
목표보다

10. 앞선
Target
기능

11. 구현
Start
삼천포로

13. go to hell
기능

14. 구현
기능

15. 구현
목표보다

16. 앞선
Target
기능

17. 구현
Start
삼천포로

19. result
dirty
no plan
no maintenance

21. result
beautiful
have plan
efficiently maintenance
more

23. emergency
Problem
Planning Development Testing Release

25. Git-flow?
shell script for git
smart branching strategy for git
Vincent Driessen’s branching model
source : https://github.com/nvie/gitflow

26. git init - initialization
$ mkdir git-flow-edu
$ cd git-flow-edu
~/path/to/git-flow-edu$ git init
Initialized empty Git repository in /path/to/git-flow-edu/.git/

27. git flow help
usage: git flow subcommand
Available subcommands are:
init Initialize a new git repo with support for the branching model.
feature Manage your feature branches.
release Manage your release branches.
hotfix Manage your hotfix branches.
support Manage your support branches.
version Shows version information.
Try 'git flow subcommand help' for details.

28. git flow init
$ mkdir git-flow-edu
$ cd git-flow-edu
~/path/to/git-flow-edu$ git flow init
Initialized empty Git repository in /path/to/git-flow-edu/.git/
No branches exist yet. Base branches must be created now.
Branch name for production releases: [master]
Branch name for next release development: [develop]
How to name your supporting branch prefixes?
Feature branches? [feature/]
Release branches? [release/]
Hotfix branches? [hotfix/]
Support branches? [support/]
Version tag prefix? []

29. git flow feature
base : develop
~/path/to/git-flow-edu$ git flow feature start name [base]
~/path/to/git-flow-edu$ git flow feature finish name

30. git flow feature help
usage: git flow feature [list] [-v]
git flow feature start [-F] name [base]
git flow feature finish [-rFk] name|nameprefix
git flow feature publish name
git flow feature track name
git flow feature diff [name|nameprefix]
git flow feature rebase [-i] [name|nameprefix]
git flow feature checkout [name|nameprefix]
git flow feature pull remote [name]

31. git flow release
base : develop
~/path/to/git-flow-edu$ git flow release start release [base]
~/path/to/git-flow-edu$ git flow release finish release

32. git flow release help
usage: git flow release [list] [-v]
git flow release start [-F] version
git flow release finish [-Fsumpk] version
git flow release publish name
git flow release track name

33. git flow hotfix
base : master
~/path/to/git-flow-edu$ git flow hotfix start release [base]
~/path/to/git-flow-edu$ git flow hotfix finish release

34. git flow hotfix help
usage: git flow hotfix [list] [-v]
git flow hotfix start [-F] version [base]
git flow hotfix finish [-Fsumpk] version

35. git flow support
Experimental !

36. references
http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/
https://github.com/nvie/gitflow

37. other tools
git-extra : high-level utilities for git
https://github.com/rhiokim/git-extras
gitlab : free Project/Repository management application
https:/github.com/sitaramc/gitolite
gitolite : hosting Git repositories easily and securely
https:/github.com/sitaramc/gitolite
git-diff-grep : Run grep across git diffs history
https://github.com/oscardelben/git-diff-grep
gerrit : Web based code review system
http://code.google.com/p/gerrit/