git & work flow practice

15
Copyright 2010, Intridea Inc. All Rights Reserved. Git & WorkFlow Practice [email protected] 2011/08/30 Lightning Talk @ RailsWed http://groups.google.com/group/railsw ed

Upload: vidar

Post on 15-Feb-2016

92 views

Category:

Documents


0 download

DESCRIPTION

Git & Work Flow Practice. [email protected] 2011/08/30 L ightning Talk @ RailsWed http://groups.google.com/group/railswed. About Me. a.k.a. - yorzi Details - about.me/wangyaodi Senior Engineer at Intridea Inc. More Links: http://tech.wangyaodi.com - PowerPoint PPT Presentation

TRANSCRIPT

Page 1: Git  &  Work Flow Practice

Copyright 2010, Intridea Inc. All Rights Reserved.

Git & WorkFlow Practice

[email protected]/08/30

Lightning Talk @ RailsWedhttp://groups.google.com/group/railswed

Page 2: Git  &  Work Flow Practice

Copyright 2010, Intridea Inc. All Rights Reserved.

About Me a.k.a. - yorzi Details - about.me/wangyaodi Senior Engineer at Intridea Inc.

More Links: http://tech.wangyaodi.com http://github.com/yorzi http://twitter.com/yorzi http://more-other-sites/yorzi

王要弟Andy Wang

Page 3: Git  &  Work Flow Practice

Copyright 2010, Intridea Inc. All Rights Reserved.

Page 4: Git  &  Work Flow Practice

Copyright 2010, Intridea Inc. All Rights Reserved.

http://zh-cn.whygitisbetterthanx.com

Page 5: Git  &  Work Flow Practice

Copyright 2010, Intridea Inc. All Rights Reserved.

Git & Workflow

Page 6: Git  &  Work Flow Practice

Copyright 2010, Intridea Inc. All Rights Reserved.

Subversion-Style Workflow

Page 7: Git  &  Work Flow Practice

Copyright 2010, Intridea Inc. All Rights Reserved.

Integration Manager Workflow

Page 8: Git  &  Work Flow Practice

Copyright 2010, Intridea Inc. All Rights Reserved.

Dictator and Lieutenants Workflow

Page 9: Git  &  Work Flow Practice

Copyright 2010, Intridea Inc. All Rights Reserved.

Intridea’s Git-Flow

http://nvie.com/posts/a-successful-git-branching-model/

Vincent Driessen’ Git-Flow

Page 10: Git  &  Work Flow Practice

Copyright 2010, Intridea Inc. All Rights Reserved.

Page 11: Git  &  Work Flow Practice

Copyright 2010, Intridea Inc. All Rights Reserved.

Tool: GitFlow

https://github.com/nvie/gitflowhttp://ihower.tw/blog/archives/5140

http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow

Page 12: Git  &  Work Flow Practice

Copyright 2010, Intridea Inc. All Rights Reserved.

Tool: Git-Goggles

https://github.com/nowells/git-goggleshttp://teebes.com/blog/22/introducing-git-goggles

Page 13: Git  &  Work Flow Practice

Copyright 2010, Intridea Inc. All Rights Reserved.

Git Tricks• Git auto-completion

–http://www.codethatmatters.com/2010/01/git-autocomplete-in-mac-os-x/

• Easy logalias gl='git log --pretty=format:"%Cgreen%h%Creset%x09%an%x09%Cblue%ar%Creset%x09%s"'

• Display branch name in terminalexport PS1="\u@\h\w\[$txtcyn\]\$git_branch\[$txtrst\]:”

Page 14: Git  &  Work Flow Practice

Copyright 2010, Intridea Inc. All Rights Reserved.

More Resources• Git Official Site

–http://git-scm.com/–http://gitbook.liuhui998.com/

• Learn Git via PPT–http://www.slideshare.net/littlebtc/git-5528339

• Why Git is Better than X–http://zh-cn.whygitisbetterthanx.com/

Page 15: Git  &  Work Flow Practice

Copyright 2010, Intridea Inc. All Rights Reserved.

Thank You!