Lets Get Git Git Goals for Today Touch

Lets Get Git!

Git Goals for Today • Touch on where Git got started • Why its cool! • Differences between Git & TFS • Use • Branching • Work Flows • Tools • Lets play!!! Darin King - asidarin@gmail. com

Git – Where it Started • Created by Linux Torvalds - 2005 • Needed something for Linux source • Easy to use by developers around the world Darin King - asidarin@gmail. com

Git – Why is it cool! NO CH A FREE RG E • DISTRIBUTED • Trades heavyweight Branching in TFS for lightweight branching Git • Complete history! • Changes your mind on version control • Commit early and often • Works on Windows, Linux, Unix, Mac • Works for and text based writing • Dev work on binary files (Word, PDF, etc. ) NO CO ST Darin King - asidarin@gmail. com

Git – Why is it cool! - Distributed Darin King - asidarin@gmail. com

Git – Why is it cool! – Complete History Darin King - asidarin@gmail. com

Git – Differences between Git & TFS Description TFS Git Branching Not Easy Very Easy Offline access to history No Yes Offline commit No Yes Private local branches No Yes Learning curve Low Medium (kind of) Admin Learning curve Very High Medium-High Install ½ day 10 minutes Cost ? Free Darin King - asidarin@gmail. com

Git – Use Vi – VIM example • Hundreds or thousands of commands, shortcuts • I probably know 15 -20 commands • Git commands – over 100 • But on a daily basis, you will probably only use 8 -10 Darin King - asidarin@gmail. com

Git – Use Git init. Git add. Git status (your friend) Git commit –m “commit message here” Git push –u origin master Darin King - asidarin@gmail. com

Git – Use (more) Git checkout –b “branch name” Git fetch master Git merge master/branch Git diff Git clone Git log (your other friend) Darin King - asidarin@gmail. com

Git – Use (more) Edit Add Commit Darin King - asidarin@gmail. com

Git – Use (more) Darin King - asidarin@gmail. com

Git – Use (more) Darin King - asidarin@gmail. com

Git – Use (more) Darin King - asidarin@gmail. com

Git – Branching Darin King - asidarin@gmail. com

Git – Use (more) Darin King - asidarin@gmail. com

Git – Work-Flow Darin King - asidarin@gmail. com

Git – Git. Hub Flow So, what is Git. Hub Flow? • Anything in the master branch is deployable • To work on something new, create a descriptively named branch off of master (ie: new-oauth 2 -scopes) (or on my recent project List. Tool. Search) • Commit to that branch locally and regularly push your work to the same named branch on the server • When you need feedback or help, or you think the branch is ready for merging, open a pull request • After someone else has reviewed and signed off on the feature, you can merge it into master • Once it is merged and pushed to ‘master’, you can and should deploy immediately Darin King - asidarin@gmail. com

Git – Work Flows Many, many others!! Darin King - asidarin@gmail. com

Git – Tools Git. Hub – Largest Bitbucket (Atlassian, Jira) Git-TFS Others Darin King - asidarin@gmail. com

Git – Lets Play!!! 1. Command line 2. Visual Studio 3. Eclipse 4. Web Storm Darin King - asidarin@gmail. com

Links • • O’Reilly Mastering Git & Mastering Advanced Git (DSUG 50 for 50% off) www. Git-scm. com (free book, excellent) Conversational GIT – www. blog. anvard. org/conversational-git/ Git. Hub training – www. training. github. com/classes/index. html Atlassian training – www. bit. ly/1 Bx. TZtr Learn Git Branching – www. bit. ly/1 GX 4 RFE Simpler Work Flow - http: //bit. ly/191 xp. Cw 10 Things I hate about Git - http: //bit. ly/1 H 1 NZB 2 Darin King - asidarin@gmail. com

Lets Get Git! Thank You! darink@asicomp. com asidarin@gmail. com