1. Xx de enero de 2010 Use git without rage

2. “VCS should be a subject in informatics” Heared about VCS

3. “ We use VCS as if we were trained monkeys” Heared about VCS

4. Types of VCS LVCS (Localized VCS) CVCS (Centralized VCS) DVCS (Distributed VCS)

6. rcs (mac os)

8. CVS

10. Mercurial

11. Git Basics

13. Global: git config --global (~/.gitconfig)

15. git config --global user.name 'wadus'

16. Git Basics

17. File status cycle untracked staged modified unmodified git add edit git add git commit git commit -a

44. Branching: the beginning of magic Please, keep on thinking in local... or I will send @pacoguzman to kill you!!!

46. Branching: the beginning of magic taken from http://progit.org/

48. Branching: the beginning of magic taken from http://progit.org/

52. Branching: the beginning of magic taken from http://progit.org/

54. Branching: the beginning of magic taken from http://progit.org/

56. Branching: the beginning of magic taken from http://progit.org/

58. Branching: the beginning of magic taken from http://progit.org/

61. Branching: the beginning of magic taken from http://progit.org/

63. Branching: the beginning of magic taken from http://progit.org/

65. Branching: the beginning of magic taken from http://progit.org/

69. Do some work on that branch

70. Swear after you receive that f*ck*ng damned call

71. Commit or stash all the changes that you haven't saved yet – if you want to -

72. Checkout your production (usually master) branch

73. Create a branch to add the hotfix

74. Fix that so f*ck*ng urgent issue

75. Merge this branch and push it to production

76. Switch back to your original story and continue working on it

88. Branching workflows

89. Branching workflows: long running branches taken from http://progit.org/

90. Branching workflows: topic branches taken from http://progit.org/

96. Rebasing

99. Basic rebasing vs merge taken from http://progit.org/

102. Rebasing onto other branches taken from http://progit.org/

107. Rebasing or not rebasing? taken from http://progit.org/

111. DISTRIBUTED WORKFLOWS

112. Centralized workflow (small teams) taken from http://progit.org/

113. Integration manager workflow (github) taken from http://progit.org/

114. Dictator Lieutenant Workflow (linux kernel) taken from http://progit.org/

115. Tricks & Tips

126. !gracias!