This document provides an overview of version control and introduces the basics of using Git for version control. It discusses centralized and decentralized version control systems and why version control is useful. It then demonstrates how to set up and use basic Git commands like configuring user information, initializing a repository, adding and committing files, viewing logs and status, branching and merging, and resolving conflicts. Remote repositories on services like Beanstalk are also covered at a basic level.

1. Version Control Chris Nagele Alex Hillman

4. Beanstalkapp.com Go sign up for a free trial now!

5. Why Version Control?

6. Why Version Control? cp index.html index-v12-old2.html

7. Why Version Control? cp index.html index-v12-old2.html There has to be a better way

11. Version Control Options

12. Centralized

13. Centralized Client & Server Relationship

15. Decentralized (also known as Distributed)

16. Decentralized A Network of Complete "Repositories"

18. Any questions so far?

19. Get Git!

20. Get Git! http://bit.ly/downloadgit - for OSX

21. Get Git! http://bit.ly/downloadgit - for OSX Other platform? Sorry! http://git-scm.com

22. Get Sample Files http://bit.ly/samplefiles

23. Terminal

24. Global Config

30. My First Repository You never forget your first

31. Ignoring Files It's nothing personal

32. Git Status What the hell is going on?

33. The Stage And how to get your files on it

34. PSA: Beware of Empty Folders!

35. Committing No diamond necessary

38. Inline Commits For quickies

39. Verbose Commits More to say? That's ok!

40. Stash Git's "Clipboard"

41. Commits as Communication Tasks, tickets, links, & more

42. Log What happened and when?

43. Remotes Don't change that channel

44. Sign up for Beanstalk! It’s ok…we’ll wait….

45. Keys

48. Keys

49. Creating a Remote The Easy Way – with Beanstalk

50. git remote add

51. git push

52. git push beanstalk master

53. Remotes Connecting some dots between the command line and Beanstalk

54. Remotes I Think I’m A Clone Now

55. Catastophe Delete your work

56. git clone

57. git remote

58. git remote rename

59. git pull

60. git pull beanstalk master

61. Branches

62. git branch

63. git checkout

64. Branches + Remotes

65. git push beanstalk ________ where ________ is the name of your branch

66. git push beanstalk colorchange

67. git pull beanstalk colorchange

68. Integrating Changes Without A Time Traveling DeLorean.

69. Rebase

70. Rebase Check out progit.org

71. Merge

72. Make sure you’re on the branch you want to merge TO

73. git merge __________ Where __________ is the name of your branch you wish to merge in.

74. Keep that Repo Tidy

75. git branch –d __________ Where __________ is the name of your branch you wish to delete.

76. Conflict Resolution

77. You didn’t commit yet!

79. You Did Commit! But…

81. Conflict Delimiters

82. Commit, then push!

83. Where to learn more

84. Thank You! Chris Nagele – Alex Hillman http://www.beanstalkapp.com @beanstalkapp