GIT – tips & tricks Partnership
Truly distributed version control GIT – tips & tricks
Basic terminology Working directory (project) Index (staging) Git repository (database) Stash GIT – tips & tricks http://git-scm.com/book/en/v2/Getting-Started-Git-Basics
Typical usage GIT – tips & tricks http://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository
Typical usage # cd MyProject # git init / git clone # (…changing files…) # git add (preparing to commit) # git commit # git push / git pull GIT – tips & tricks
What is a git commit? GIT – tips & tricks
Organizing your commits # git add -p <file> GIT – tips & tricks http://nuclearsquid.com/writings/git-add/
Sharing your commits http://stackoverflow.com/questions/5884784/how-to-pull-remote-branch-from-somebody-elses-repo GIT – tips & tricks
Exporting commits to patch files (and sending them over e-mail) # git format-patch index 98e10a1..828dd1a 100644 --- a/pink.html +++ b/pink.html @@ -7,8 +7,7 @@ </head> <body> <h1 style="color: #F0F">The Pink Page</h1> - <p>Pink is <span style="color: #F0F">girly, - flirty and fun</span>!</p> + <p>Only <span style="color: #F0F">real men</span> wear pink!</p> <p><a href="index.html">Return to home page</a></p> </body> GIT – tips & tricks
(strong support for non-linear development) Branches (strong support for non-linear development) GIT – tips & tricks
Reuse your commits # git cherry-pick GIT – tips & tricks
Merging branches # git merge GIT – tips & tricks
Reorganizing commits # git rebase GIT – tips & tricks
Finding a commit which introduced a bug # git bisect GIT – tips & tricks http://five.agency/cut-your-way-through-problems-with-git-bisect/
Git hooks (events) Trailing spaces cleanup Auto build project (continuous integration) E-mail notifications GIT – tips & tricks
http://nvie.com/posts/a-successful-git-branching-model/
https://code.google.com/p/gource/ Gource https://code.google.com/p/gource/ GIT – tips & tricks
Thank you Mladen Bukejlovic m.bukejlovic@vegaitsourcing.rs