A world without source control leads to scary stories around the campfire. We all know we should commit early and often, and we’ve been told that Git is the system of choice. Looking at tutorials can be intimidating, though, with terminal commands here and bash commands there. What does it all mean, and how can you use it as a developer, designer, architect or analyst? In this session, we will work through these obstacles to bolster your Git knowledge en route to earning your ‘Git More Done’ Camp Badge.

1. Git Obstacle Course Stop BASHing your head and break down the basics

2. about me
• Cleveland, OH
• .NET Web Developer
• CardinalCommerce
• @cjb5790
• http://chris.bohatka.com

5. why should I get git?
• decentralized
• works offline (default)
• flexible
• lightweight
• widely supported
• better control

6. install git (windows)

7. install git (windows)

8. install git (mac)

9. now what?

10. lets create our first repo
but how?

11. tools

12. github for windows

13. atlassian sourcetree

14. axosoft gitkraken

15. git bash
• shell running in cygwin
• cygwin = terminal
• terminal = program that runs a shell
• shell = program that runs commands
• console = type of terminal

17. command line (CLI)

19. Terminal
=
Bash

21. basic bash commands
ls list files in current directory
cd change current directory
touch create a new blank file
rm remove a file
mv “move” - rename file
mkdir create a new directory
rmdir remove a directory
rm -rf remove directory and contents
more show the contents of a file

22. creating a repo
git init

24. add files
git add <filename>

25. stage
• all files that will be committed, but
have not been committed yet

28. git ignore

29. let’s commit

30. how to commit
git commit

31. but before we
commit...

32. ...ALWAYS diff!

33. ALWAYS diff
git diff

35. git difftool
git difftool -t <tool name>
git difftool

38. git difftool
git config --global diff.tool kdiff3

41. git != svn | tfs | vss

42. git commit
git commit -a
git commit -a -m
git commit -a -m “[commit message]”

43. commit early, commit often

44. branches

45. branches
• branching is EXTREMELY cheap in git
• performant
• easy (straight-forward)
• you will branch A LOT
• most branches will be local only
• branch life expectancy is very short

46. branches
git branch shiny-new-feature
git checkout shiny-new-feature

47. git checkout
• switches active branch
• doesn’t actually ‘pull’ any files
• unless you “git fetch”

48. creating a branch

49. removing a branch

50. git merge
git merge <name-of-branch>

51. git mergetool
• resolve merge conflicts using GUI of your
choice
• KDiff3 - http://kdiff3.sourceforge.net
• AraxisMerge -
http://www.araxis.com/merge/index.en
git mergetool -t <tool name>

52. git mergetool
git config --global mergetool.kdiff3.path
/Applications/kdiff3.app/Contents/MacOS/kdiff3

53. git mergetool
git mergetool -t kdiff3

56. git mergetool
git config --global merge.tool kdiff3

57. git mergetool
git mergetool

60. remotes
Remote
(GitHub, Bitbucket,
etc)
Clone #1
(My PC)
Clone #2
(Co-Worker’s PC)

61. repository hosts
https://github.com https://bitbucket.org

64. how to pull/push
git pull
git push

66. git revert & reset
• revert
• single commit
• reset
• all changes since
last commit
git revert <commit> git reset

67. git cherry-pick
git cherry-pick <revision>

70. gitflow
• promotes positive
development workflow
• easily differentiates
new features and bugs
• streamlines release
management
• allows easy “logging”
of changes
* http://nvie.com/posts/a-successful-git-branching-model/

71. tags
git tag -a <version> -m <commit message>
git tag -a v1.0 -m ‘MVP launch’

73. git aliases
• git command
• stores in git config file
• user specific
fig --global alias.nameOfAlias “command to

74. git aliases
git config --global alias.hadouken ‘push’
git config --global alias.cm ‘commit -a -m’
git config --global alias.glog ‘log --graph’

75. commit with alias

76. bash aliases
• shell level shortcut
alias nameOfAlias=“command to alias”

77. bash aliases
alias gcm=‘git commit -a -m’
alias gpull=‘git pull’
alias gpush=‘git push’
alias newrepo=‘git init’

79. git autocorrect
git config --global help.autocorrect 10

81. resources
• https://git-scm.com/doc
• https://try.github.io
• https://www.atlassian.com/git/
• https://training.github.com/kit/downloads
/github-git-cheat-sheet.pdf

82. thank you
@cjb5790