copyright 2010, intridea inc. all rights reserved. git & workflow practice @yorzi lightning talk...
TRANSCRIPT
![Page 1: Copyright 2010, Intridea Inc. All Rights Reserved. Git & WorkFlow Practice @yorzi Lightning Talk in Xi'an Rubyists Party 2014/12/21](https://reader030.vdocument.in/reader030/viewer/2022032518/56649cc95503460f94990e58/html5/thumbnails/1.jpg)
Copyright 2010, Intridea Inc. All Rights Reserved.
Git & WorkFlow Practice
@yorziLightning Talk in Xi'an Rubyists Party
2014/12/21
![Page 2: Copyright 2010, Intridea Inc. All Rights Reserved. Git & WorkFlow Practice @yorzi Lightning Talk in Xi'an Rubyists Party 2014/12/21](https://reader030.vdocument.in/reader030/viewer/2022032518/56649cc95503460f94990e58/html5/thumbnails/2.jpg)
Copyright 2010, Intridea Inc. All Rights Reserved.
![Page 3: Copyright 2010, Intridea Inc. All Rights Reserved. Git & WorkFlow Practice @yorzi Lightning Talk in Xi'an Rubyists Party 2014/12/21](https://reader030.vdocument.in/reader030/viewer/2022032518/56649cc95503460f94990e58/html5/thumbnails/3.jpg)
Copyright 2010, Intridea Inc. All Rights Reserved.
http://zh-cn.whygitisbetterthanx.com
![Page 4: Copyright 2010, Intridea Inc. All Rights Reserved. Git & WorkFlow Practice @yorzi Lightning Talk in Xi'an Rubyists Party 2014/12/21](https://reader030.vdocument.in/reader030/viewer/2022032518/56649cc95503460f94990e58/html5/thumbnails/4.jpg)
Copyright 2010, Intridea Inc. All Rights Reserved.
Workflow
![Page 5: Copyright 2010, Intridea Inc. All Rights Reserved. Git & WorkFlow Practice @yorzi Lightning Talk in Xi'an Rubyists Party 2014/12/21](https://reader030.vdocument.in/reader030/viewer/2022032518/56649cc95503460f94990e58/html5/thumbnails/5.jpg)
Copyright 2010, Intridea Inc. All Rights Reserved.
Subversion-Style Workflow
![Page 6: Copyright 2010, Intridea Inc. All Rights Reserved. Git & WorkFlow Practice @yorzi Lightning Talk in Xi'an Rubyists Party 2014/12/21](https://reader030.vdocument.in/reader030/viewer/2022032518/56649cc95503460f94990e58/html5/thumbnails/6.jpg)
Copyright 2010, Intridea Inc. All Rights Reserved.
Integration Manager Workflow
![Page 7: Copyright 2010, Intridea Inc. All Rights Reserved. Git & WorkFlow Practice @yorzi Lightning Talk in Xi'an Rubyists Party 2014/12/21](https://reader030.vdocument.in/reader030/viewer/2022032518/56649cc95503460f94990e58/html5/thumbnails/7.jpg)
Copyright 2010, Intridea Inc. All Rights Reserved.
Dictator and Lieutenants Workflow
![Page 8: Copyright 2010, Intridea Inc. All Rights Reserved. Git & WorkFlow Practice @yorzi Lightning Talk in Xi'an Rubyists Party 2014/12/21](https://reader030.vdocument.in/reader030/viewer/2022032518/56649cc95503460f94990e58/html5/thumbnails/8.jpg)
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 9: Copyright 2010, Intridea Inc. All Rights Reserved. Git & WorkFlow Practice @yorzi Lightning Talk in Xi'an Rubyists Party 2014/12/21](https://reader030.vdocument.in/reader030/viewer/2022032518/56649cc95503460f94990e58/html5/thumbnails/9.jpg)
Copyright 2010, Intridea Inc. All Rights Reserved.
![Page 10: Copyright 2010, Intridea Inc. All Rights Reserved. Git & WorkFlow Practice @yorzi Lightning Talk in Xi'an Rubyists Party 2014/12/21](https://reader030.vdocument.in/reader030/viewer/2022032518/56649cc95503460f94990e58/html5/thumbnails/10.jpg)
Copyright 2010, Intridea Inc. All Rights Reserved.
Tool: GitFlow
https://github.com/nvie/gitflowhttp://ihower.tw/blog/archives/5140http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow
![Page 11: Copyright 2010, Intridea Inc. All Rights Reserved. Git & WorkFlow Practice @yorzi Lightning Talk in Xi'an Rubyists Party 2014/12/21](https://reader030.vdocument.in/reader030/viewer/2022032518/56649cc95503460f94990e58/html5/thumbnails/11.jpg)
Copyright 2010, Intridea Inc. All Rights Reserved.
Tool: Git-Goggles
https://github.com/nowells/git-goggleshttp://teebes.com/blog/22/introducing-git-goggles
![Page 12: Copyright 2010, Intridea Inc. All Rights Reserved. Git & WorkFlow Practice @yorzi Lightning Talk in Xi'an Rubyists Party 2014/12/21](https://reader030.vdocument.in/reader030/viewer/2022032518/56649cc95503460f94990e58/html5/thumbnails/12.jpg)
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 13: Copyright 2010, Intridea Inc. All Rights Reserved. Git & WorkFlow Practice @yorzi Lightning Talk in Xi'an Rubyists Party 2014/12/21](https://reader030.vdocument.in/reader030/viewer/2022032518/56649cc95503460f94990e58/html5/thumbnails/13.jpg)
Copyright 2010, Intridea Inc. All Rights Reserved.
Git Commands merge & rebase
new and delete branches
one local → multiple remotes
![Page 14: Copyright 2010, Intridea Inc. All Rights Reserved. Git & WorkFlow Practice @yorzi Lightning Talk in Xi'an Rubyists Party 2014/12/21](https://reader030.vdocument.in/reader030/viewer/2022032518/56649cc95503460f94990e58/html5/thumbnails/14.jpg)
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: Copyright 2010, Intridea Inc. All Rights Reserved. Git & WorkFlow Practice @yorzi Lightning Talk in Xi'an Rubyists Party 2014/12/21](https://reader030.vdocument.in/reader030/viewer/2022032518/56649cc95503460f94990e58/html5/thumbnails/15.jpg)
Copyright 2010, Intridea Inc. All Rights Reserved.
Thank You!