├── art
    └── screenshot.png
├── _config.yml
├── footer.md
├── common.js
├── exercises
    ├── menu.json
    ├── git_status_and_git_diff
    │   ├── exercise.js
    │   └── problem.md
    ├── git_init
    │   ├── exercise.js
    │   └── problem.md
    ├── git_commit
    │   ├── exercise.js
    │   └── problem.md
    ├── git_add
    │   ├── exercise.js
    │   └── problem.md
    ├── git_checkout
    │   ├── exercise.js
    │   └── problem.md
    ├── git_merge
    │   ├── exercise.js
    │   └── problem.md
    ├── git_tag
    │   ├── exercise.js
    │   └── problem.md
    ├── git_branch
    │   ├── exercise.js
    │   └── problem.md
    ├── git_reset
    │   ├── exercise.js
    │   └── problem.md
    ├── git_fetch
    │   ├── exercise.js
    │   └── problem.md
    ├── git_push
    │   ├── exercise.js
    │   └── problem.md
    └── git_rebase
    │   ├── exercise.js
    │   └── problem.md
├── package.json
├── learnyougit.js
├── common-git.js
├── .gitignore
├── README.md
├── params.json
├── stylesheets
    ├── github-light.css
    ├── stylesheet.css
    └── normalize.css
├── index.html
└── LICENSE


/art/screenshot.png:
--------------------------------------------------------------------------------
https://raw.githubusercontent.com/Karumi/learnyougit/HEAD/art/screenshot.png


--------------------------------------------------------------------------------
/_config.yml:
--------------------------------------------------------------------------------
1 | title: "learnyougit"
2 | baseurl: /learnyougit
3 | remote_theme: Karumi/KarumiJekyllTheme
4 | 


--------------------------------------------------------------------------------
/footer.md:
--------------------------------------------------------------------------------
1 | __»__ To print these instructions again, run: {grey}{appname} print{/grey}
2 | __»__ To verify you have the correct environment, run: {grey}{appname} verify{/grey}
3 | __»__ For help run: {grey}{appname} help{/grey}
4 | 


--------------------------------------------------------------------------------
/common.js:
--------------------------------------------------------------------------------
 1 | const chalk = require('chalk')
 2 | 
 3 | function Common() {}
 4 | 
 5 | Common.logError = function(message) {
 6 |     console.log('\n ' + chalk.red('[ERROR]') + ' ' + message);
 7 | }
 8 | 
 9 | module.exports = Common;
10 | 


--------------------------------------------------------------------------------
/exercises/menu.json:
--------------------------------------------------------------------------------
 1 | [
 2 |     "GIT INIT",
 3 |     "GIT ADD",
 4 |     "GIT COMMIT",
 5 |     "GIT BRANCH",
 6 |     "GIT CHECKOUT",
 7 |     "GIT RESET",
 8 |     "GIT STATUS AND GIT DIFF",
 9 |     "GIT TAG",
10 |     "GIT FETCH",
11 |     "GIT PUSH",
12 |     "GIT MERGE",
13 |     "GIT REBASE"
14 | ]
15 | 


--------------------------------------------------------------------------------
/exercises/git_status_and_git_diff/exercise.js:
--------------------------------------------------------------------------------
 1 | const exercise = require('workshopper-exercise')()
 2 | 
 3 | exercise.addProcessor(function (mode, callback) {
 4 |     callback(null, true)
 5 | });
 6 | 
 7 | exercise.hideSolutions = true;
 8 | exercise.requireSubmission = false;
 9 | 
10 | module.exports = exercise;
11 | 


--------------------------------------------------------------------------------
/package.json:
--------------------------------------------------------------------------------
 1 | {
 2 |   "name": "learnyougit",
 3 |   "version": "1.0.2",
 4 |   "repository": {
 5 |     "type": "git",
 6 |     "url": "git://github.com/karumi/learnyougit"
 7 |   },
 8 |   "license": "Apache-2.0",
 9 |   "bin": "./learnyougit.js",
10 |   "dependencies": {
11 |     "workshopper": "2.7.0",
12 |     "workshopper-exercise": "3.0.1",
13 |     "nodegit": "0.24.1",
14 |     "chalk": "2.4.2"
15 |   }
16 | }
17 | 


--------------------------------------------------------------------------------
/learnyougit.js:
--------------------------------------------------------------------------------
 1 | #!/usr/bin/env node
 2 | 
 3 | const workshopper = require('workshopper'),
 4 |       path        = require('path')
 5 | 
 6 | function fpath (f) {
 7 |     return path.join(__dirname, f)
 8 | }
 9 | 
10 | workshopper({
11 |     name        : 'learnyougit',
12 |     title       : 'Learn you git',
13 |     subtitle    : 'Git interactive workshop',
14 |     appDir      : __dirname,
15 |     menuItems   : [],
16 |     exerciseDir : fpath('./exercises/'),
17 |     footerFile  : fpath('./footer.md')
18 | })
19 | 


--------------------------------------------------------------------------------
/common-git.js:
--------------------------------------------------------------------------------
 1 | function CommonGit() {}
 2 | 
 3 | CommonGit.isNotOrigin = function(remoteName) {
 4 |     return remoteName !== 'origin'
 5 | }
 6 | 
 7 | CommonGit.isInRemote = function(reference) {
 8 |     return reference.isRemote() === 1
 9 | }
10 | 
11 | CommonGit.isTag = function(reference) {
12 |     return reference.isTag() === 1
13 | }
14 | 
15 | CommonGit.isMasterBranch = function(name) {
16 |     return name === 'refs/heads/master' || name === 'refs/remotes/origin/master'
17 | }
18 | 
19 | CommonGit.isNotMasterBranch = function(name) {
20 |     return !CommonGit.isMasterBranch(name)
21 | }
22 | 
23 | module.exports = CommonGit;
24 | 


--------------------------------------------------------------------------------
/exercises/git_init/exercise.js:
--------------------------------------------------------------------------------
 1 | const exercise = require('workshopper-exercise')()
 2 | const Git = require('nodegit')
 3 | const Common = require('../../common')
 4 | 
 5 | exercise.addProcessor(function (mode, callback) {
 6 |     Git.Repository.open('.')
 7 |     .then(() => {
 8 |         process.nextTick(function () {
 9 |             callback(null, true)
10 |         });
11 |     }).catch(() => {
12 |         process.nextTick(function () {
13 |             Common.logError('You have not created a Git repository in your current directory')
14 |             callback(null, false)
15 |         });
16 |     })
17 | });
18 | 
19 | exercise.hideSolutions = true;
20 | exercise.requireSubmission = false;
21 | 
22 | module.exports = exercise;
23 | 


--------------------------------------------------------------------------------
/.gitignore:
--------------------------------------------------------------------------------
 1 | # Logs
 2 | logs
 3 | *.log
 4 | npm-debug.log*
 5 | 
 6 | # Runtime data
 7 | pids
 8 | *.pid
 9 | *.seed
10 | 
11 | # Directory for instrumented libs generated by jscoverage/JSCover
12 | lib-cov
13 | 
14 | # Coverage directory used by tools like istanbul
15 | coverage
16 | 
17 | # nyc test coverage
18 | .nyc_output
19 | 
20 | # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
21 | .grunt
22 | 
23 | # node-waf configuration
24 | .lock-wscript
25 | 
26 | # Compiled binary addons (http://nodejs.org/api/addons.html)
27 | build/Release
28 | 
29 | # Dependency directories
30 | node_modules
31 | jspm_packages
32 | 
33 | # Optional npm cache directory
34 | .npm
35 | 
36 | # Optional REPL history
37 | .node_repl_history
38 | 


--------------------------------------------------------------------------------
/exercises/git_commit/exercise.js:
--------------------------------------------------------------------------------
 1 | const exercise = require('workshopper-exercise')()
 2 | const Git = require('nodegit')
 3 | const Common = require('../../common')
 4 | 
 5 | exercise.addProcessor(function (mode, callback) {
 6 |     Git.Repository.open('.')
 7 |     .then(repository => {
 8 |         return repository.getHeadCommit()
 9 |     }).then(commit => {
10 |         if (commit === null) {
11 |             throw new Error('You have not created any commit yet')
12 |         }
13 | 
14 |         process.nextTick(function () {
15 |             callback(null, true)
16 |         });
17 |     }).catch(error => {
18 |         process.nextTick(function () {
19 |             Common.logError(error.message)
20 |             callback(null, false)
21 |         });
22 |     })
23 | });
24 | 
25 | exercise.hideSolutions = true;
26 | exercise.requireSubmission = false;
27 | 
28 | module.exports = exercise;
29 | 


--------------------------------------------------------------------------------
/exercises/git_add/exercise.js:
--------------------------------------------------------------------------------
 1 | const exercise = require('workshopper-exercise')()
 2 | const Git = require('nodegit')
 3 | const Common = require('../../common')
 4 | 
 5 | exercise.addProcessor(function (mode, callback) {
 6 |     Git.Repository.open('.')
 7 |     .then(repository => {
 8 |         return repository.index()
 9 |     }).then(index => {
10 |         if (index.entryCount() === 0) {
11 |             throw new Error('There are no tracked files in your repository')
12 |         }
13 | 
14 |         process.nextTick(function () {
15 |             callback(null, true)
16 |         });
17 |     }).catch(error => {
18 |         process.nextTick(function () {
19 |             Common.logError(error.message)
20 |             callback(null, false)
21 |         });
22 |     })
23 | });
24 | 
25 | exercise.hideSolutions = true;
26 | exercise.requireSubmission = false;
27 | 
28 | module.exports = exercise;
29 | 


--------------------------------------------------------------------------------
/exercises/git_checkout/exercise.js:
--------------------------------------------------------------------------------
 1 | const exercise = require('workshopper-exercise')()
 2 | const Git = require('nodegit')
 3 | const Common = require('../../common')
 4 | const CommonGit = require('../../common-git')
 5 | 
 6 | exercise.addProcessor(function (mode, callback) {
 7 |     Git.Repository.open('.')
 8 |     .then(repository => {
 9 |         return repository.head()
10 |     }).then(head => {
11 |         if (CommonGit.isMasterBranch(head.name())) {
12 |             throw new Error('You are still in the master branch')
13 |         }
14 | 
15 |         process.nextTick(function () {
16 |             callback(null, true)
17 |         });
18 |     }).catch(error => {
19 |         process.nextTick(function () {
20 |             Common.logError(error.message)
21 |             callback(null, false)
22 |         });
23 |     })
24 | });
25 | 
26 | exercise.hideSolutions = true;
27 | exercise.requireSubmission = false;
28 | 
29 | module.exports = exercise;
30 | 


--------------------------------------------------------------------------------
/exercises/git_merge/exercise.js:
--------------------------------------------------------------------------------
 1 | const exercise = require('workshopper-exercise')()
 2 | const Git = require('nodegit')
 3 | const Common = require('../../common')
 4 | 
 5 | exercise.addProcessor(function (mode, callback) {
 6 |     Git.Repository.open('.')
 7 |     .then(repository => {
 8 |         return repository.getReferenceCommit('merge-lesson/base-branch')
 9 |     }).then(commit => {
10 |         return commit.getParents()
11 |     }).then(parents => {
12 |         if (parents.length < 2) {
13 |             throw new Error('The current commit only has one parent. It should have two after the merge!')
14 |         }
15 | 
16 |         process.nextTick(function () {
17 |             callback(null, true)
18 |         });
19 |     }).catch(error => {
20 |         process.nextTick(function () {
21 |             Common.logError(error.message)
22 |             callback(null, false)
23 |         });
24 |     })
25 | });
26 | 
27 | exercise.hideSolutions = true;
28 | exercise.requireSubmission = false;
29 | 
30 | module.exports = exercise;
31 | 


--------------------------------------------------------------------------------
/exercises/git_tag/exercise.js:
--------------------------------------------------------------------------------
 1 | const exercise = require('workshopper-exercise')()
 2 | const Git = require('nodegit')
 3 | const Common = require('../../common')
 4 | const CommonGit = require('../../common-git')
 5 | 
 6 | exercise.addProcessor(function (mode, callback) {
 7 |     Git.Repository.open('.')
 8 |     .then(repository => {
 9 |         return repository.getReferences(Git.Reference.TYPE.LISTALL)
10 |     }).then(references => {
11 |         return references.filter(CommonGit.isTag)
12 |     }).then(references => {
13 |         if (references.length === 0) {
14 |             throw new Error('There are no tags in your repository')
15 |         }
16 | 
17 |         process.nextTick(function () {
18 |             callback(null, true)
19 |         });
20 |     }).catch(error => {
21 |         process.nextTick(function () {
22 |             Common.logError(error.message)
23 |             callback(null, false)
24 |         });
25 |     })
26 | });
27 | 
28 | exercise.hideSolutions = true;
29 | exercise.requireSubmission = false;
30 | 
31 | module.exports = exercise;
32 | 


--------------------------------------------------------------------------------
/exercises/git_branch/exercise.js:
--------------------------------------------------------------------------------
 1 | const exercise = require('workshopper-exercise')()
 2 | const Git = require('nodegit')
 3 | const Common = require('../../common')
 4 | const CommonGit = require('../../common-git')
 5 | 
 6 | exercise.addProcessor(function (mode, callback) {
 7 |     Git.Repository.open('.')
 8 |     .then(repository => {
 9 |         return repository.getReferenceNames(Git.Reference.TYPE.LISTALL)
10 |     }).then(referenceNames => {
11 |         return referenceNames.filter(CommonGit.isNotMasterBranch)
12 |     }).then(referenceNames => {
13 |         if (referenceNames.length === 0) {
14 |             throw new Error('There are no new branches in your repository')
15 |         }
16 | 
17 |         process.nextTick(function () {
18 |             callback(null, true)
19 |         });
20 |     }).catch(error => {
21 |         process.nextTick(function () {
22 |             Common.logError(error.message)
23 |             callback(null, false)
24 |         });
25 |     })
26 | });
27 | 
28 | exercise.hideSolutions = true;
29 | exercise.requireSubmission = false;
30 | 
31 | module.exports = exercise;
32 | 


--------------------------------------------------------------------------------
/exercises/git_reset/exercise.js:
--------------------------------------------------------------------------------
 1 | const exercise = require('workshopper-exercise')()
 2 | const Git = require('nodegit')
 3 | const Common = require('../../common')
 4 | 
 5 | exercise.addProcessor(function (mode, callback) {
 6 |     Git.Repository.open('.')
 7 |     .then(repository => {
 8 |         return repository.getReferences(Git.Reference.TYPE.LISTALL)
 9 |     }).then(references => {
10 |         if (references.length < 2) {
11 |             throw new Error('You need both, a master branch and your own')
12 |         }
13 | 
14 |         if (!references[0].target().equal(references[1].target())) {
15 |             throw new Error('Both branches are not pointing to the same commit')
16 |         }
17 | 
18 |         process.nextTick(function () {
19 |             callback(null, true)
20 |         });
21 |     }).catch(error => {
22 |         process.nextTick(function () {
23 |             Common.logError(error.message)
24 |             callback(null, false)
25 |         });
26 |     })
27 | });
28 | 
29 | exercise.hideSolutions = true;
30 | exercise.requireSubmission = false;
31 | 
32 | module.exports = exercise;
33 | 


--------------------------------------------------------------------------------
/exercises/git_fetch/exercise.js:
--------------------------------------------------------------------------------
 1 | const exercise = require('workshopper-exercise')()
 2 | const Git = require('nodegit')
 3 | const Common = require('../../common')
 4 | const CommonGit = require('../../common-git')
 5 | 
 6 | var _repository
 7 | 
 8 | exercise.addProcessor(function (mode, callback) {
 9 |     Git.Repository.open('.')
10 |     .then(repository => {
11 |         _repository = repository
12 |         return repository.getRemotes()
13 |     }).then(remotes => {
14 |         if (remotes.length <= 0) {
15 |             throw new Error('There are no remotes in this repository')
16 |         }
17 | 
18 |         return _repository.getReferences(Git.Reference.TYPE.LISTALL)
19 |     }).then(references => {
20 |         return references.filter(CommonGit.isInRemote)
21 |     }).then(references => {
22 |         if (references.length === 0) {
23 |             throw new Error('There are no remote branches in your repository')
24 |         }
25 | 
26 |         process.nextTick(function () {
27 |             callback(null, true)
28 |         });
29 |     }).catch(error => {
30 |         process.nextTick(function () {
31 |             Common.logError(error.message)
32 |             callback(null, false)
33 |         });
34 |     })
35 | });
36 | 
37 | exercise.hideSolutions = true;
38 | exercise.requireSubmission = false;
39 | 
40 | module.exports = exercise;
41 | 


--------------------------------------------------------------------------------
/exercises/git_push/exercise.js:
--------------------------------------------------------------------------------
 1 | const exercise = require('workshopper-exercise')()
 2 | const Git = require('nodegit')
 3 | const Common = require('../../common')
 4 | const CommonGit = require('../../common-git')
 5 | 
 6 | var _repository
 7 | 
 8 | exercise.addProcessor(function (mode, callback) {
 9 |     Git.Repository.open('.')
10 |     .then(repository => {
11 |         _repository = repository
12 |         return repository.getRemotes()
13 |     }).then(remotes => {
14 |         return remotes.filter(CommonGit.isNotOrigin)
15 |     }).then(remotes => {
16 |         if (remotes.length <= 0) {
17 |             throw new Error('There are no remotes different from origin in this repository')
18 |         }
19 | 
20 |         return _repository.getRemote('my-fork')
21 |     }).then(remote => {
22 |         if (remote.url().endsWith('Karumi/learnyougit.git')) {
23 |             throw new Error('The ' + remote.name() + ' remote is not pointing to a learnyougit fork')
24 |         }
25 | 
26 |         process.nextTick(function () {
27 |             callback(null, true)
28 |         });
29 |     }).catch(error => {
30 |         process.nextTick(function () {
31 |             Common.logError(error.message)
32 |             callback(null, false)
33 |         });
34 |     })
35 | });
36 | 
37 | exercise.hideSolutions = true;
38 | exercise.requireSubmission = false;
39 | 
40 | module.exports = exercise;
41 | 


--------------------------------------------------------------------------------
/exercises/git_rebase/exercise.js:
--------------------------------------------------------------------------------
 1 | const exercise = require('workshopper-exercise')()
 2 | const Git = require('nodegit')
 3 | const Common = require('../../common')
 4 | 
 5 | var _repository
 6 | var _ancestorCommit
 7 | 
 8 | exercise.addProcessor(function (mode, callback) {
 9 |     Git.Repository.open('.')
10 |     .then(repository => {
11 |         _repository = repository
12 |         return repository.getReferenceCommit('rebase-lesson/base-branch')
13 |     }).then(commit => {
14 |         return commit.getParents()
15 |     }).then(parents => {
16 |         if (parents.length != 1) {
17 |             throw new Error('The current commit has more than one parent, that means you merged your branch!')
18 |         }
19 | 
20 |         _ancestorCommit = parents[0]
21 |     }).then(() => {
22 |         return _repository.getReferenceCommit('rebase-lesson/onto-branch')
23 |     }).then(commit => {
24 |         if (commit.sha() != _ancestorCommit.sha()) {
25 |             throw new Error('Your parent commit is not in rebase-lesson/onto-branch')
26 |         }
27 | 
28 |         process.nextTick(function () {
29 |             callback(null, true)
30 |         });
31 |     }).catch(error => {
32 |         process.nextTick(function () {
33 |             Common.logError(error.message)
34 |             callback(null, false)
35 |         });
36 |     })
37 | });
38 | 
39 | exercise.hideSolutions = true;
40 | exercise.requireSubmission = false;
41 | 
42 | module.exports = exercise;
43 | 


--------------------------------------------------------------------------------
/exercises/git_init/problem.md:
--------------------------------------------------------------------------------
 1 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
 2 | 
 3 | ## Description
 4 | 
 5 | To start using Git you first need to create a new repository.
 6 | 
 7 | A repository is nothing but a filesystem where, besides storing all your data, you can keep track of all the changes performed on it.
 8 | 
 9 | There are several ways of creating a repository, we will use the simplest one though, which is to create it with the command `git init`
10 | 
11 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
12 | 
13 | ## In-depth
14 | 
15 | When we run `git init`, Git creates a folder in your current directory called `.git`. This folder stores, among other things:
16 | * All the files contents tracked by Git (including all the different versions of the same file)
17 | * A tree-like data structure representing folders at specific points in time.
18 | * Metadata such as descriptions, authors, file permissions, etc.
19 | 
20 | You can take a look to all the things Git created for you, we will see what most of the folders and files are in detail in the following exercises:
21 | 
22 |     {grey}
23 |     .git
24 |     ├── HEAD
25 |     ├── objects
26 |     └── refs
27 |         ├── heads
28 |         └── tags{/grey}
29 | 
30 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
31 | 
32 | ## Task
33 | 
34 | Create a new Git repository with the command
35 | ```
36 | git init
37 | ```
38 | 
39 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
40 | 


--------------------------------------------------------------------------------
/README.md:
--------------------------------------------------------------------------------
 1 | ![Karumi logo][karumilogo] Learn You A Git For Serious Amusement!
 2 | ======
 3 | 
 4 | Learn how to use Git in an interactive workshop right from your favourite console. No previous knowledge of Git or other version control system is needed, just a console, `npm` and your hands!
 5 | 
 6 | ![Screenshot][screenshot]
 7 | 
 8 | Usage
 9 | -----
10 | 
11 | 1. Install node from the [official page](https://nodejs.org/en/download/)
12 | 2. `npm install learnyougit -g`
13 | 3. `learnyougit`
14 | 
15 | Once inside the workshop you will be able to navigate through all the lessons and validate your knowledge!
16 | 
17 | Libraries
18 | ---------
19 | 
20 | * [workshopper](https://github.com/workshopper/workshopper-adventure)
21 | * [nodegit](https://github.com/nodegit/nodegit)
22 | * [chalk](https://github.com/chalk/chalk)
23 | 
24 | License
25 | -------
26 | 
27 | ```
28 | Copyright 2016 Karumi
29 | 
30 | Licensed under the Apache License, Version 2.0 (the "License");
31 | you may not use this file except in compliance with the License.
32 | You may obtain a copy of the License at
33 | 
34 |    http://www.apache.org/licenses/LICENSE-2.0
35 | 
36 | Unless required by applicable law or agreed to in writing, software
37 | distributed under the License is distributed on an "AS IS" BASIS,
38 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
39 | See the License for the specific language governing permissions and
40 | limitations under the License.
41 | ```
42 | 
43 | [screenshot]: art/screenshot.png
44 | [karumilogo]: https://cloud.githubusercontent.com/assets/858090/11626547/e5a1dc66-9ce3-11e5-908d-537e07e82090.png
45 | 


--------------------------------------------------------------------------------
/params.json:
--------------------------------------------------------------------------------
1 | {
2 |   "name": "Learn You a Git",
3 |   "tagline": "A self-guided workshop to learn the basics and internals of Git",
4 |   "body": "![Karumi logo][karumilogo] Learn You A Git For Serious Amusement!\r\n======\r\n\r\nLearn how to use Git in an interactive workshop right from your favourite console. No previous knowledge of Git or other version control system is needed, just a console, `npm` and your hands!\r\n\r\n![Screenshot][screenshot]\r\n\r\nUsage\r\n-----\r\n\r\n1. Install node from the [official page](https://nodejs.org/en/download/)\r\n2. `npm install learnyougit -g`\r\n3. `learnyougit`\r\n\r\nOnce inside the workshop you will be able to navigate through all the lessons and validate your knowledge!\r\n\r\nLibraries\r\n---------\r\n\r\n* [workshopper](https://github.com/workshopper/workshopper-adventure)\r\n* [nodegit](https://github.com/nodegit/nodegit)\r\n* [chalk](https://github.com/chalk/chalk)\r\n\r\nLicense\r\n-------\r\n\r\n```\r\nCopyright 2016 Karumi\r\n\r\nLicensed under the Apache License, Version 2.0 (the \"License\");\r\nyou may not use this file except in compliance with the License.\r\nYou may obtain a copy of the License at\r\n\r\n   http://www.apache.org/licenses/LICENSE-2.0\r\n\r\nUnless required by applicable law or agreed to in writing, software\r\ndistributed under the License is distributed on an \"AS IS\" BASIS,\r\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\nSee the License for the specific language governing permissions and\r\nlimitations under the License.\r\n```\r\n\r\n[screenshot]: art/screenshot.png\r\n[karumilogo]: https://cloud.githubusercontent.com/assets/858090/11626547/e5a1dc66-9ce3-11e5-908d-537e07e82090.png\r\n",
5 |   "note": "Don't delete this file! It's used internally to help with page regeneration."
6 | }


--------------------------------------------------------------------------------
/exercises/git_add/problem.md:
--------------------------------------------------------------------------------
 1 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
 2 | 
 3 | ## Description
 4 | 
 5 | Right now your repository isn't tracking anything at all. Let's change that by adding a single file.
 6 | 
 7 | In order to do that, you must first create a file. Use your favorite editor or the command `touch {filename}` to create an empty file.
 8 | 
 9 | Now we need to tell Git that we want to add that file to our repository by typing `git add {filename}` and, voilà! Git now recognizes the file and has added it to its tracking system.
10 | 
11 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
12 | 
13 | ## In-depth
14 | 
15 | When the command `git add` is executed, Git creates a `blob` object, which is nothing but the contents of the tracked file conveniently compressed. The path to this blob object is defined by the SHA1 of the contents of the file.
16 | 
17 | Git also creates all the metadata of the tracked file such as:
18 | * Name of the file
19 | * File permissions
20 | * ...
21 | 
22 | You will notice your Git folder has changed. The two main differences are the index file and the objects folder:
23 | 
24 |     {grey}
25 |     .git
26 |     ├── HEAD
27 |     ├── {/grey}{green}index{/green}{grey}
28 |     ├── {/grey}{green}objects{/green}{grey}
29 |     │   └── {/grey}{green}a1{/green}{grey}
30 |     |       └── {/grey}{green}9abfea0f…{/green}{grey}
31 |     ├── refs
32 |     │   ├── heads
33 |     └   └── tags{/grey}
34 | 
35 | The index file is just a description of what is going to be saved in the next snapshot. This is usually called the `index` or the `staging area`. It contains all metadata for the files that have been added. You can take a look to your index with the following command:
36 | 
37 | ```
38 | > git ls-files --stage
39 | 
40 |   100644 a19abfea0… 0 file.txt
41 | 
42 | ```
43 | 
44 | There is also a new `objects` directory. All Git objects follow the same naming format which is the SHA1 of its contents, 40 digits (2 in the folder name + 38 in the file name). In this case, the object is the blob object with the contents of the file we added to the index. You can see the data stored in a blob with the following command:
45 | 
46 | ```
47 | > git show a19abfea0
48 | 
49 |   Hello git-workshopper
50 | ```
51 | 
52 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
53 | 
54 | ## Task
55 | 
56 | Add a new file to your newly created Git repository with the command
57 | ```
58 | git add {filename}
59 | ```
60 | 
61 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
62 | 


--------------------------------------------------------------------------------
/exercises/git_tag/problem.md:
--------------------------------------------------------------------------------
 1 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
 2 | 
 3 | ## Description
 4 | 
 5 | Git branches are updated when creating commits, but sometimes, we want to store a reference to a very specific version of our files and keep it there. Tags are the solution to that problem. Like branches, tags are also a pointer to a commit but they are not updated when creating new snapshots.
 6 | 
 7 | There are two types of tags, `lightweight` and `annotated`. The key difference being that the former are just a reference to a commit while the latter can be signed or have a message of their own. To create a lightweight tag just use the command `git tag {tag-name}`. If you want to create an annotated tag instead, use `git tag -a {tag-name}`.
 8 | 
 9 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
10 | 
11 | ## In-depth
12 | 
13 | Inside Git, tags are just another type of reference:
14 | 
15 |     {grey}
16 |     .git
17 |     ├── HEAD
18 |     ├── index
19 |     ├── objects
20 |     │   ├── {/grey}{green}f1{/green}{grey}
21 |     │       └── {/grey}{green}25c5e653…{/green}{grey}
22 |     │   └── …
23 |     ├── refs
24 |     │   ├── heads
25 |     │   └── {/grey}{green}tags{/green}{grey}
26 |     │       └── {/grey}{green}my-annotated-tag{/green}{grey}
27 |     └       └── {/grey}{green}my-lightweight-tag{/green}
28 | 
29 | In the case of lightweight tags, Git stores a reference to the commit it's pointing:
30 | 
31 | ```
32 | > cat .git/refs/tags/my-lightweight-tag
33 | 
34 |   f366dcd55917499fe56b5f17a20e738f90214d6d
35 | ```
36 | 
37 | In the case of annotated tags, they hold a reference to a new `tag` object. Is in this tag object where all the metadata is stored:
38 | 
39 | ```
40 | > cat .git/refs/tags/my-annotated-tag
41 | 
42 |   f125c5e653cadd84c491200c0f4d78574c1a03e0
43 | 
44 | > git show -s --pretty=raw f125c5e653cadd84c491200c0f4d78574c1a03e0
45 | 
46 |   tag my-annotated-tag
47 |   Tagger: Sergio Gutierrez <sergio@gokarumi.com>
48 | 
49 |   This is an annotated tag
50 | 
51 |   commit f366dcd55917499fe56b5f17a20e738f90214d6d
52 |   tree 993f122c6730b0cba7800dbeace3772f788fd5ae
53 |   parent 8015528d2189f64f814a0e022d37b6ccbd3fedb3
54 |   author Sergio Gutierrez <sergio@gokarumi.com> 1470482062 +0200
55 |   committer Sergio Gutierrez <sergio@gokarumi.com> 1470482062 +0200
56 | 
57 |     This is a commit
58 | ```
59 | 
60 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
61 | 
62 | ## Task
63 | 
64 | Create a new tag using the command
65 | ```
66 | git tag {tag-name}
67 | ```
68 | 
69 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
70 | 


--------------------------------------------------------------------------------
/stylesheets/github-light.css:
--------------------------------------------------------------------------------
  1 | /*
  2 | The MIT License (MIT)
  3 | 
  4 | Copyright (c) 2016 GitHub, Inc.
  5 | 
  6 | Permission is hereby granted, free of charge, to any person obtaining a copy
  7 | of this software and associated documentation files (the "Software"), to deal
  8 | in the Software without restriction, including without limitation the rights
  9 | to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 10 | copies of the Software, and to permit persons to whom the Software is
 11 | furnished to do so, subject to the following conditions:
 12 | 
 13 | The above copyright notice and this permission notice shall be included in all
 14 | copies or substantial portions of the Software.
 15 | 
 16 | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 17 | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 18 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 19 | AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 20 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 21 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 22 | SOFTWARE.
 23 | 
 24 | */
 25 | 
 26 | .pl-c /* comment */ {
 27 |   color: #969896;
 28 | }
 29 | 
 30 | .pl-c1 /* constant, variable.other.constant, support, meta.property-name, support.constant, support.variable, meta.module-reference, markup.raw, meta.diff.header */,
 31 | .pl-s .pl-v /* string variable */ {
 32 |   color: #0086b3;
 33 | }
 34 | 
 35 | .pl-e /* entity */,
 36 | .pl-en /* entity.name */ {
 37 |   color: #795da3;
 38 | }
 39 | 
 40 | .pl-smi /* variable.parameter.function, storage.modifier.package, storage.modifier.import, storage.type.java, variable.other */,
 41 | .pl-s .pl-s1 /* string source */ {
 42 |   color: #333;
 43 | }
 44 | 
 45 | .pl-ent /* entity.name.tag */ {
 46 |   color: #63a35c;
 47 | }
 48 | 
 49 | .pl-k /* keyword, storage, storage.type */ {
 50 |   color: #a71d5d;
 51 | }
 52 | 
 53 | .pl-s /* string */,
 54 | .pl-pds /* punctuation.definition.string, string.regexp.character-class */,
 55 | .pl-s .pl-pse .pl-s1 /* string punctuation.section.embedded source */,
 56 | .pl-sr /* string.regexp */,
 57 | .pl-sr .pl-cce /* string.regexp constant.character.escape */,
 58 | .pl-sr .pl-sre /* string.regexp source.ruby.embedded */,
 59 | .pl-sr .pl-sra /* string.regexp string.regexp.arbitrary-repitition */ {
 60 |   color: #183691;
 61 | }
 62 | 
 63 | .pl-v /* variable */ {
 64 |   color: #ed6a43;
 65 | }
 66 | 
 67 | .pl-id /* invalid.deprecated */ {
 68 |   color: #b52a1d;
 69 | }
 70 | 
 71 | .pl-ii /* invalid.illegal */ {
 72 |   color: #f8f8f8;
 73 |   background-color: #b52a1d;
 74 | }
 75 | 
 76 | .pl-sr .pl-cce /* string.regexp constant.character.escape */ {
 77 |   font-weight: bold;
 78 |   color: #63a35c;
 79 | }
 80 | 
 81 | .pl-ml /* markup.list */ {
 82 |   color: #693a17;
 83 | }
 84 | 
 85 | .pl-mh /* markup.heading */,
 86 | .pl-mh .pl-en /* markup.heading entity.name */,
 87 | .pl-ms /* meta.separator */ {
 88 |   font-weight: bold;
 89 |   color: #1d3e81;
 90 | }
 91 | 
 92 | .pl-mq /* markup.quote */ {
 93 |   color: #008080;
 94 | }
 95 | 
 96 | .pl-mi /* markup.italic */ {
 97 |   font-style: italic;
 98 |   color: #333;
 99 | }
100 | 
101 | .pl-mb /* markup.bold */ {
102 |   font-weight: bold;
103 |   color: #333;
104 | }
105 | 
106 | .pl-md /* markup.deleted, meta.diff.header.from-file */ {
107 |   color: #bd2c00;
108 |   background-color: #ffecec;
109 | }
110 | 
111 | .pl-mi1 /* markup.inserted, meta.diff.header.to-file */ {
112 |   color: #55a532;
113 |   background-color: #eaffea;
114 | }
115 | 
116 | .pl-mdr /* meta.diff.range */ {
117 |   font-weight: bold;
118 |   color: #795da3;
119 | }
120 | 
121 | .pl-mo /* meta.output */ {
122 |   color: #1d3e81;
123 | }
124 | 
125 | 


--------------------------------------------------------------------------------
/exercises/git_fetch/problem.md:
--------------------------------------------------------------------------------
 1 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
 2 | 
 3 | ## Description
 4 | 
 5 | Now that you are able to create your own repositories, commit and create branches and tags, you must be willing to share your work with others. This is where remotes comes into play. A remote is just a URL where you can upload your work and download others work. You can have as many remotes as you want and even give them names.
 6 | 
 7 | In order to add a new remote to your repository you'll need to execute `git remote add {remote-name} {remote-url}`, for example, `git remote add origin git@github.com:Karumi/learnyougit.git`. `origin` is a special remote name, it's the one Git uses by default when loading a repository directly from a remote with `git clone`. There are other `git remote` operations like `remove`, `rename` or `prune`. You can check what do they do by typing `git remote --help`.
 8 | 
 9 | Once the remote has been added, you can load whatever that remote contains into your local repository. This is done with the command `git fetch {remote-name}`. This won't modify your files or branches in any way. All branches coming from the remote will be kept separated from your local ones and will be prefixed with the name of the remote, e.g. `origin/my-branch`.
10 | 
11 | Keep in mind that you don't have control over remote branches from your local repository. This means that if you do a checkout to a remote branch (with `git checkout origin/my-branch`), your commits won't affect that branch, that would be a huge synchronization problem!. Instead, Git will point to the latest commit of the remote branch and will warn you of being in detached HEAD state.
12 | 
13 | In the following lesson we will learn how to upload your changes to a remote.
14 | 
15 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
16 | 
17 | ## In-depth
18 | 
19 | Remotes information is stored in the `config` file
20 | 
21 |     {grey}
22 |     .git
23 |     ├── HEAD
24 |     ├── index
25 |     ├── {/grey}{green}config{/green}{grey}
26 |     ├── objects
27 |     │   ├── …
28 |     ├── refs
29 |     │   ├── heads
30 |     └   └── tags{/grey}
31 | 
32 | Besides the remotes information, the config file contains lots of other things such as settings for your repository. Being a plain text file you can easily take a look:
33 | 
34 | ```
35 | > cat .git/config
36 | 
37 |   ...
38 |   [remote "origin"]
39 |     url = git@github.com:Karumi/learnyougit.git
40 |     fetch = +refs/heads/*:refs/remotes/origin/*
41 | ```
42 | 
43 | There is an easier way to see all the information stored for a remote:
44 | 
45 | ```
46 | > git remote show origin
47 | 
48 |   * remote origin
49 |     Fetch URL: git@github.com:Karumi/learnyougit.git
50 |     Push  URL: git@github.com:Karumi/learnyougit.git
51 |     HEAD branch: master
52 |     Remote branch:
53 |       master tracked
54 |     Local branch configured for 'git pull':
55 |       master merges with remote master
56 |     Local ref configured for 'git push':
57 |       master pushes to master (up to date)
58 | ```
59 | 
60 | Besides the URLs used to download and upload information, Git also links local branches with remote ones. It does that so that remote-related calls like `git pull` and `git push` (that we will see in later lessons) can be automatically executed without specifying which remote branches are being updated.
61 | 
62 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
63 | 
64 | ## Task
65 | 
66 | Link your local repository to the learnyougit repository
67 | ```
68 | git remote add {remote-name} git@github.com:Karumi/learnyougit.git
69 | ```
70 | 
71 | Download all the remote information
72 | ```
73 | git fetch {remote-name}
74 | ```
75 | 
76 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
77 | 


--------------------------------------------------------------------------------
/exercises/git_status_and_git_diff/problem.md:
--------------------------------------------------------------------------------
 1 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
 2 | 
 3 | ## Description
 4 | 
 5 | So far, we've been doing lots of changes in our file history but we have no way of knowing, for example, which files are in staging. This is where `git status` and `git diff` come into play.
 6 | 
 7 | One of the many things `git status` lets us do is to tell you the state of your files. Let's see what its output looks like:
 8 | 
 9 |     {grey}
10 |     # On branch master                                  ] <- {/grey}{green}Current branch{/green}{grey}
11 |     # Changes to be committed:                          ┐
12 |     # (use "git reset HEAD <file>..." to unstage)       |
13 |     #                                                   |
14 |     #modified: file.txt                                 | <- {/grey}{green}Files in the repository with staged changes{/green}{grey}
15 |     #                                                   ┘
16 |     # Changes not staged for commit:                    ┐
17 |     # (use "git add <file>..." to update what will ...  |
18 |     # (use "git checkout -- <file>..." to discard ...   |
19 |     #                                                   |
20 |     #modified: other_file.txt                           | <- {/grey}{green}Files in the repository with non staged files{/green}{grey}
21 |     #                                                   ┘
22 |     # Untracked files:                                  ┐
23 |     # (use "git add <file>..." to include in what ...   |
24 |     #                                                   |
25 |     #another_file.txt                                   ┘ <- {/grey}{green}Files not found in the repository{/green}
26 | 
27 | In the other hand, `git diff` lets us see exactly what changes are being done in the repository. When no arguments are provided, this command will show us the changes that have not been staged. If you want to see what is staged use `git diff --staged` instead. Here is an example of what `git diff` outputs:
28 | 
29 |     {grey}
30 |     diff --git a/text.txt b/text.txt                    ] <- {/grey}{green}File name changes{/green}{grey}
31 |     index 30e6813..8c7c8d2 100644                       ] <- {/grey}{green}Revisions being compared{/green}{grey}
32 |     --- a/text.txt                                      ┐
33 |     +++ b/text.txt                                      |
34 |     @@ -1 +1,2 @@                                       | <- {/grey}{green}Content changes{/green}{grey}
35 |         -Hello people!                                  |
36 |         +Hello world!.                                  ┘
37 |     {/grey}
38 | 
39 | Lines starting with the `-` symbol are lines that have been removed whereas lines starting with `+` has been added.
40 | 
41 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
42 | 
43 | ## In-depth
44 | 
45 | These two tools work with the same trees we studied in the previous lesson: `working directory`, `index` and `HEAD`. What we see when running any of the two commands are the differences between those trees. Staged changes are the ones present in the `index` tree but not in `HEAD`. Unstaged changes are the ones present in the `working directory` but not in the `index`.
46 | 
47 | Keep in mind that we are talking about "changes" and not files. That's intentional, we can add some changes in a file to staging and, afterwards, modify it even more. In that case, a file can appear in the two first sections of the `git status` output. What Git is trying to tell us is that there are some changes in that file that are staged and others than are not.
48 | 
49 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
50 | 
51 | ## Task
52 | 
53 | No task for this lesson. You can go to the next lesson by simply running `learnyougit verify`.
54 | 
55 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
56 | 


--------------------------------------------------------------------------------
/exercises/git_branch/problem.md:
--------------------------------------------------------------------------------
 1 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
 2 | 
 3 | ## Description
 4 | 
 5 | Branches are the way Git has to handle different timelines in your files. As we just saw in the previous lesson, commits always keep a reference to its parent commit. That means we keep a linear history of our files. With branches we can have multiple of those histories.
 6 | 
 7 | Think as a branch as just a name for a specific history timeline. When you create a commit, you are just adding a snapshot to your current branch. Whatever you do in a branch won't affect others.
 8 | 
 9 | ```
10 |                    +-----------+
11 |                    | BRANCH #1 |
12 |                    +-----+-----+
13 |                          |
14 |                          V
15 | +-----------+      +-----------+      +-----------+
16 | | COMMIT #1 |<-----+ COMMIT #2 |<-----+ COMMIT #3 |
17 | +-----------+      +-----------+      +-----------+
18 |                                             A
19 |                                             |
20 |                                       +-----+-----+
21 |                                       | BRANCH #2 |
22 |                                       +-----------+
23 | ```
24 | {green}BEFORE CREATING A COMMIT IN BRANCH #1{/green}
25 | {green}- - - - - - - - - - - - - - - - - - - - - - - - - - - -{/green}
26 | {green}AFTER CREATING A COMMIT IN BRANCH #1{/green}
27 | ```
28 |                                       +-----------+
29 |                                       | BRANCH #1 |
30 |                                       +-----+-----+
31 |                                             |
32 |                                             V
33 |                                       +-----------+
34 |                                    +--+ COMMIT #4 |
35 |                                    |  +-----------+
36 |                                    |
37 | +-----------+      +-----------+   |  +-----------+
38 | | COMMIT #1 |<-----+ COMMIT #2 |<--+--+ COMMIT #3 |
39 | +-----------+      +-----------+      +-----------+
40 |                                             A
41 |                                             |
42 |                                       +-----+-----+
43 |                                       | BRANCH #2 |
44 |                                       +-----------+
45 | ```
46 | 
47 | There is one thing you might be asking yourself right now. You still have not created a branch, yet, you've been able to commit with no issues, how is that possible? Basically, Git creates a branch by default in every new repository called `master`. It's in master history where you have been tracking changes so far.
48 | 
49 | It's also important to keep in mind that, even though we learned how to create new branches, we are still stuck in master and every commit we create will be in that branch. That's because we still don't know how to tell Git what our current branch is. In the next lesson, we will learn how to do exactly that.
50 | 
51 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
52 | 
53 | ## In-depth
54 | 
55 | Branches are represented by plain text files in your Git directory:
56 | 
57 |     {grey}
58 |     .git
59 |     ├── HEAD
60 |     ├── index
61 |     ├── objects
62 |     │   └── …
63 |     ├── refs
64 |     │   ├── {/grey}{green}heads{/green}{grey}
65 |     │   │   ├── {/grey}{green}master{/green}{grey}
66 |     │   │   └── {/grey}{green}my-branch{/green}{grey}
67 |     └   └── tags{/grey}
68 | 
69 | The `heads` directory contains all your different branches. Each one only having a reference to the current commit:
70 | 
71 | ```
72 | > cat .git/refs/heads/master
73 | 
74 |   7fbc204b8f3c0f85d7e86f5982d2bffe27ea742b
75 | ```
76 | 
77 | Branches are automatically updated by Git when you commit or perform any other branch-related operation.
78 | 
79 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
80 | 
81 | ## Task
82 | 
83 | Create a new branch using the command
84 | ```
85 | git branch {branch-name}
86 | ```
87 | 
88 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
89 | 


--------------------------------------------------------------------------------
/index.html:
--------------------------------------------------------------------------------
 1 | <!DOCTYPE html>
 2 | <html lang="en-us">
 3 |   <head>
 4 |     <meta charset="UTF-8">
 5 |     <title>Learn You a Git by Karumi</title>
 6 |     <meta name="viewport" content="width=device-width, initial-scale=1">
 7 |     <link rel="stylesheet" type="text/css" href="stylesheets/normalize.css" media="screen">
 8 |     <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
 9 |     <link rel="stylesheet" type="text/css" href="stylesheets/stylesheet.css" media="screen">
10 |     <link rel="stylesheet" type="text/css" href="stylesheets/github-light.css" media="screen">
11 |   </head>
12 |   <body>
13 |     <section class="page-header">
14 |       <h1 class="project-name">Learn You a Git</h1>
15 |       <h2 class="project-tagline">A self-guided workshop to learn the basics and internals of Git</h2>
16 |       <a href="https://github.com/Karumi/learnyougit" class="btn">View on GitHub</a>
17 |       <a href="https://github.com/Karumi/learnyougit/zipball/master" class="btn">Download .zip</a>
18 |       <a href="https://github.com/Karumi/learnyougit/tarball/master" class="btn">Download .tar.gz</a>
19 |     </section>
20 | 
21 |     <section class="main-content">
22 |       <h1>
23 | <a id="-learn-you-a-git-for-serious-amusement" class="anchor" href="#-learn-you-a-git-for-serious-amusement" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a><img src="https://cloud.githubusercontent.com/assets/858090/11626547/e5a1dc66-9ce3-11e5-908d-537e07e82090.png" alt="Karumi logo"> Learn You A Git For Serious Amusement!</h1>
24 | 
25 | <p>Learn how to use Git in an interactive workshop right from your favourite console. No previous knowledge of Git or other version control system is needed, just a console, <code>npm</code> and your hands!</p>
26 | 
27 | <p><img src="art/screenshot.png" alt="Screenshot"></p>
28 | 
29 | <h2>
30 | <a id="usage" class="anchor" href="#usage" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Usage</h2>
31 | 
32 | <ol>
33 | <li>Install node from the <a href="https://nodejs.org/en/download/">official page</a>
34 | </li>
35 | <li><code>npm install learnyougit -g</code></li>
36 | <li><code>learnyougit</code></li>
37 | </ol>
38 | 
39 | <p>Once inside the workshop you will be able to navigate through all the lessons and validate your knowledge!</p>
40 | 
41 | <h2>
42 | <a id="libraries" class="anchor" href="#libraries" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>Libraries</h2>
43 | 
44 | <ul>
45 | <li><a href="https://github.com/workshopper/workshopper-adventure">workshopper</a></li>
46 | <li><a href="https://github.com/nodegit/nodegit">nodegit</a></li>
47 | <li><a href="https://github.com/chalk/chalk">chalk</a></li>
48 | </ul>
49 | 
50 | <h2>
51 | <a id="license" class="anchor" href="#license" aria-hidden="true"><span aria-hidden="true" class="octicon octicon-link"></span></a>License</h2>
52 | 
53 | <pre><code>Copyright 2016 Karumi
54 | 
55 | Licensed under the Apache License, Version 2.0 (the "License");
56 | you may not use this file except in compliance with the License.
57 | You may obtain a copy of the License at
58 | 
59 |    http://www.apache.org/licenses/LICENSE-2.0
60 | 
61 | Unless required by applicable law or agreed to in writing, software
62 | distributed under the License is distributed on an "AS IS" BASIS,
63 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
64 | See the License for the specific language governing permissions and
65 | limitations under the License.
66 | </code></pre>
67 | 
68 |       <footer class="site-footer">
69 |         <span class="site-footer-owner"><a href="https://github.com/Karumi/learnyougit">Learn You a Git</a> is maintained by <a href="https://github.com/Karumi">Karumi</a>.</span>
70 | 
71 |         <span class="site-footer-credits">This page was generated by <a href="https://pages.github.com">GitHub Pages</a> using the <a href="https://github.com/jasonlong/cayman-theme">Cayman theme</a> by <a href="https://twitter.com/jasonlong">Jason Long</a>.</span>
72 |       </footer>
73 | 
74 |     </section>
75 | 
76 |   
77 |   </body>
78 | </html>
79 | 


--------------------------------------------------------------------------------
/exercises/git_commit/problem.md:
--------------------------------------------------------------------------------
 1 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
 2 | 
 3 | ## Description
 4 | 
 5 | Now that you have, at least, one file ready to be tracked, we can tell Git to create a snapshot. This means that we are going to store the state of all tracked files at this moment. To do that we use the command `git commit`.
 6 | 
 7 | If we execute it with no additional parameters, Git will open a text editor asking you for a message to describe what you are about to store. You can also tell Git what your message is directly from command line with the parameter `-m {message}`.
 8 | 
 9 | You can create as many commits as you wish. Every commit will always keep a reference to the previous one, its parent. In this way, we can know which snapshots are older and which are newer:
10 | 
11 | ```
12 |  +-----------+      +-----------+      +-----------+
13 |  | COMMIT #1 |<-----+ COMMIT #2 |<-----+ COMMIT #3 |
14 |  +-----+-----+      +-----+-----+      +-----+-----+
15 |        |                  |                  |
16 |        V                  V                  V
17 | +-------------+    +-------------+    +-------------+
18 | | SNAPSHOT #1 |    | SNAPSHOT #2 |    | SNAPSHOT #3 |
19 | +-------------+    +-------------+    +-------------+
20 | ```
21 | 
22 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
23 | 
24 | ## In-depth
25 | 
26 | To store the tracked files, Git builds `tree` and `commit` objects. Tree objects are like directories, they store names, permissions and pointers to other objects, be it blobs or other trees. In the other hand, commit objects store a pointer to a tree and all the metadata related to the snapshot, that means, committer name, creation timestamp, message, etc.
27 | 
28 | If we take a look at your Git directory you can see there are more objects now. These are the tree and commit objects you just created:
29 | 
30 |     {grey}
31 |     .git
32 |     ├── HEAD
33 |     ├── index
34 |     ├── objects
35 |     │   ├── {/grey}{green}18{/green}{grey}
36 |     │   │   └── {/grey}{green}611beb72…{/green}{grey}
37 |     │   ├── {/grey}{green}87{/green}{grey}
38 |     │   │   └── {/grey}{green}1e25a902…{/green}{grey}
39 |     │   └── a1
40 |     |       └── 9abfea0f…
41 |     ├── refs
42 |     │   ├── heads
43 |     └   └── tags{/grey}
44 | 
45 | You can take a look at the tree object by executing the following command:
46 | 
47 | ```
48 | > git ls-tree 18611beb72
49 | 
50 |   100644 blob a19abfea0… file.txt
51 | ```
52 | 
53 | As we've already seen, a tree stores a list with all its contents. From left to right, that means file permissions, type of the object, hash of the file and name.
54 | 
55 | Commit objects can be inspected as follows:
56 | 
57 | ```
58 | > git show -s --pretty=raw 871e25a902
59 | 
60 |   commit 871e25a902ed4309e94c2f39aa7102557a380f49
61 |   tree 18611beb7265e1af0b87190179be4d78ef80862a
62 |   author Sergio Gutierrez <sergio@gokarumi.com> 1458666886 +0100
63 |   committer Sergio Gutierrez <sergio@gokarumi.com> 1458666886 +0100
64 | 
65 |     First commit
66 | ```
67 | 
68 | When we create more and more commits we start creating a linear history of your files. Keep in mind that Git will reuse tree and blob objects when possible. If file contents don't change, a new tree object can point to older blobs like in the following diagram:
69 | 
70 | ```
71 |  +-----------+      +-----------+      +-----------+
72 |  | COMMIT #1 |<-----+ COMMIT #2 |<-----+ COMMIT #3 |
73 |  +-----+-----+      +-----+-----+      +-----+-----+
74 |        |                  |                  |
75 |        V                  V                  V
76 |   +---------+        +---------+        +---------+
77 |   | TREE #1 |        | TREE #2 |        | TREE #3 |
78 |   +----+----+        +----+----+        +----+----+
79 |        |                  |                  |
80 |        V                  V                  |
81 |   +---------+        +---------+             |
82 |   | BLOB #1 |        | BLOB #2 |<------------+
83 |   +---------+        +---------+
84 | ```
85 | 
86 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
87 | 
88 | ## Task
89 | 
90 | Commit your staged files with the command
91 | ```
92 | git commit -m {message}
93 | ```
94 | 
95 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
96 | 


--------------------------------------------------------------------------------
/exercises/git_checkout/problem.md:
--------------------------------------------------------------------------------
  1 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
  2 | 
  3 | ## Description
  4 | 
  5 | Now that we know what branches are, we probably want to start moving between them. That's what `git checkout` is for. Try to move to your newly created branch adding its name to the end of the command: `git checkout {branch-name}`.
  6 | 
  7 | Git will always store a reference to your working branch called `HEAD`. When you create a new repository, `HEAD` will be pointing to the master branch. Doing a checkout to a branch only means updating that pointer to reference the specified branch.
  8 | 
  9 | ```
 10 |                      +------+
 11 |                      | HEAD |
 12 |                      +---+--+
 13 |                          |
 14 |                          V
 15 |                    +-----------+
 16 |                    | BRANCH #1 |
 17 |                    +-----+-----+
 18 |                          |
 19 |                          V
 20 | +-----------+      +-----------+      +-----------+
 21 | | COMMIT #1 |<-----+ COMMIT #2 |<-----+ COMMIT #3 |
 22 | +-----------+      +-----------+      +-----------+
 23 |                          A
 24 |                          |
 25 |                    +-----+-----+
 26 |                    | BRANCH #2 |
 27 |                    +-----------+
 28 | ```
 29 | {green}BEFORE DOING A CHECKOUT TO BRANCH #2{/green}
 30 | {green}- - - - - - - - - - - - - - - - - - - - - - - - - - - -{/green}
 31 | {green}AFTER DOING A CHECKOUT TO BRANCH #2{/green}
 32 | ```
 33 |                    +-----------+
 34 |                    | BRANCH #1 |
 35 |                    +-----+-----+
 36 |                          |
 37 |                          V
 38 | +-----------+      +-----------+      +-----------+
 39 | | COMMIT #1 |<-----+ COMMIT #2 |<-----+ COMMIT #3 |
 40 | +-----------+      +-----------+      +-----------+
 41 |                          A
 42 |                          |
 43 |                    +-----+-----+
 44 |                    | BRANCH #2 |
 45 |                    +-----------+
 46 |                          A
 47 |                          |
 48 |                      +---+--+
 49 |                      | HEAD |
 50 |                      +------+
 51 | ```
 52 | {green}BEFORE CREATING A COMMIT{/green}
 53 | {green}- - - - - - - - - - - - - - - - - - - - - - - - - - - -{/green}
 54 | {green}AFTER CREATING A COMMIT{/green}
 55 | ```
 56 |                    +-----------+
 57 |                    | BRANCH #1 |
 58 |                    +-----+-----+
 59 |                          |
 60 |                          V
 61 | +-----------+      +-----------+      +-----------+
 62 | | COMMIT #1 |<-----+ COMMIT #2 |<--+--+ COMMIT #3 |
 63 | +-----------+      +-----------+   |  +-----------+
 64 |                                    |        
 65 |                                    |  +-----------+
 66 |                                    +--+ COMMIT #4 |
 67 |                                       +-----------+
 68 |                                             A
 69 |                                             |
 70 |                                       +-----+-----+
 71 |                                       | BRANCH #2 |
 72 |                                       +-----------+
 73 |                                             A
 74 |                                             |
 75 |                                         +---+--+
 76 |                                         | HEAD |
 77 |                                         +------+
 78 | ```
 79 | 
 80 | From now on, all the commits you create will change `BRANCH #2` history instead of `BRANCH #1`.
 81 | 
 82 | Git also lets you move to specific commits by using their hash (or partial hash if there is no conflict with other hashes), e.g. `git checkout 871e25a9`. Git calls this situation to be in a `detached HEAD` state, meaning, your HEAD isn't pointing to a branch but a commit. If Git finds itself in this situation, it won't update any branch when creating new commits.
 83 | 
 84 | ```
 85 | +-----------+        +------+
 86 | | BRANCH #1 |        | HEAD |
 87 | +-----+-----+        +---+--+
 88 |       |                  |
 89 |       V                  V
 90 | +-----------+      +-----------+
 91 | + COMMIT #1 |<-----+ COMMIT #2 |
 92 | +-----------+      +-----------+
 93 | ```
 94 | {green}BEFORE CREATING A COMMIT{/green}
 95 | {green}- - - - - - - - - - - - - - - - - - - - - - - - - - - -{/green}
 96 | {green}AFTER CREATING A COMMIT{/green}
 97 | ```
 98 | +-----------+                           +------+
 99 | | BRANCH #1 |                           | HEAD |
100 | +-----+-----+                           +---+--+
101 |       |                                     |
102 |       V                                     V
103 | +-----------+      +-----------+      +-----------+
104 | | COMMIT #1 |<-----+ COMMIT #2 |<-----+ COMMIT #3 |
105 | +-----------+      +-----------+      +-----------+
106 | ```
107 | 
108 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
109 | 
110 | ## In-depth
111 | 
112 | As we saw, Git keeps track of your current branch with a pointer called `HEAD`. This pointer is nothing but a file with the same name.
113 | 
114 | {grey}
115 | .git
116 | ├── {/grey}{green}HEAD{/green}{grey}
117 | ├── index
118 | ├── objects
119 | │   └── …
120 | ├── refs
121 | │   ├── heads
122 | │   │   ├── master
123 | │   │   └── my-branch
124 | └   └── tags{/grey}
125 | 
126 | You can print the contents of the `HEAD` file to see that it only contains the name of the branch its pointing to:
127 | 
128 | ```
129 | > cat .git/HEAD
130 | 
131 |   ref: refs/heads/master
132 | ```
133 | 
134 | If your HEAD is pointing to a commit, it will contain its hash instead:
135 | ```
136 | > cat .git/HEAD
137 | 
138 |   d57d319c4057b02c8095c2e7c7daedc9c6194f93
139 | ```
140 | 
141 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
142 | 
143 | ## Task
144 | 
145 | Move to another branch using
146 | ```
147 | git checkout {branch-name|commit}
148 | ```
149 | 
150 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
151 | 


--------------------------------------------------------------------------------
/exercises/git_rebase/problem.md:
--------------------------------------------------------------------------------
  1 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
  2 | 
  3 | ## Description
  4 | 
  5 | We already reviewed how to use the `merge` tool, it's now time to learn how to use its companion, the `rebase` command! The main goal of `git rebase` is to unify branches keeping a linear history, that means that Git won't create commits with two parents. Git users often find this desirable because, in this way, it's easier to navigate through your commits history to find bugs, revert changes and so.
  6 | 
  7 | To start using rebase, we first need to specify a branch where we want to rebase ours. This is done with the syntax `git rebase {base-branch}`. As with other Git operations, we can also use commit hashes or relative commits.
  8 | 
  9 | How does Git keeps a linear history? It basically "replays" all the commits that are in your current branch (but are not in your base branch) on top of the tip of the base branch. The process can be separated in the following steps:
 10 | * Find the most recent commit that is shared by both branches, the current one and the branch you are rebasing into.
 11 | * Starting from that shared commit, save all commits present in your current branch.
 12 | * Reset your current branch to the most recent commit in the base branch.
 13 | * Replay every saved commit in order.
 14 | 
 15 | ```
 16 |                      +------+
 17 |                      | HEAD |
 18 |                      +---+--+
 19 |                          |
 20 |                          V
 21 |                    +-----------+
 22 |                    | BRANCH #1 |
 23 |                    +-----+-----+
 24 |                          |
 25 |                          V
 26 |                    +-----------+
 27 |                 +--+ COMMIT #2 |
 28 |                 |  +-----------+
 29 |                 |
 30 | +-----------+   |  +-----------+
 31 | | COMMIT #1 |<--+--+ COMMIT #3 |
 32 | +-----------+      +-----------+
 33 |                          A
 34 |                          |
 35 |                    +-----+-----+
 36 |                    | BRANCH #2 |
 37 |                    +-----------+
 38 | ```
 39 | {green}BEFORE REBASING BRANCH #1 ONTO BRANCH #2{/green}
 40 | {green}- - - - - - - - - - - - - - - - - - - - - - - - - - - -{/green}
 41 | {green}AFTER REBASING BRANCH #1 ONTO BRANCH #2{/green}
 42 | ```
 43 |                                             +------+
 44 |                                             | HEAD |
 45 |                                             +---+--+
 46 |                                                 |
 47 |                                                 V
 48 |                                           +-----------+
 49 |                                           | BRANCH #1 |
 50 |                                           +-----+-----+
 51 |                                                 |
 52 |                                                 V
 53 | +-----------+      +-----------+      +-------------------+
 54 | | COMMIT #1 |<-----+ COMMIT #3 |<-----+ COPY OF COMMIT #2 |
 55 | +-----------+      +-----------+      +-------------------+
 56 |                          A
 57 |                          |
 58 |                    +-----+-----+
 59 |                    | BRANCH #2 |
 60 |                    +-----------+
 61 | ```
 62 | 
 63 | As in with the merge command, rebase only modifies your current branch. Notice how we no longer reference the old `COMMIT #2`, that means that we "lost" it. However, it's important to keep in mind that the commit has not been deleted and it is possible to go back to it with other Git commands like `git reflog`.
 64 | 
 65 | If other people were to work with that branch and commits on top of `COMMIT #2` then they would find themselves in a problem because the history of the branch has been modified! This is the reason `git rebase` is often discouraged when sharing your branches. There is no problem in using it in your own personal branches though.
 66 | 
 67 | Just as we could have conflicts while using `git merge`, there can also be conflicts while rebasing. If that happens, the `rebase` command will stop and will ask you to solve your conflicts before continuing with the process. Once you have solved all your conflicts, you will need to call `git rebase --continue` to proceed with the remaining commits. You can also stop the command if you don't feel confident with the conflicts by calling `git rebase --abort`.
 68 | 
 69 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
 70 | 
 71 | ## In-depth
 72 | 
 73 | Git rebase is a really powerful tool. Besides applying the algorithm explained previously, it can be used to edit your history when used with the `--interactive` option. When that happens, Git will save all the commits that are going to be rebased as usual, but then it will stop and let you edit what to do with all those commits.
 74 | 
 75 | It will show you your configured editor and display a file that looks like this:
 76 | 
 77 | ```
 78 | pick a70d274 Oldest commit
 79 | pick 8a6b964 Old commit
 80 | pick e1e3cf0 Most recent commit
 81 | 
 82 | # Rebase aa0eda1..e1e3cf0 onto aa0eda1 (25 command(s))
 83 | #
 84 | # Commands:
 85 | # p, pick = use commit
 86 | # r, reword = use commit, but edit the commit message
 87 | # e, edit = use commit, but stop for amending
 88 | # s, squash = use commit, but meld into previous commit
 89 | # f, fixup = like "squash", but discard this commit's log message
 90 | # x, exec = run command (the rest of the line) using shell
 91 | # d, drop = remove commit
 92 | #
 93 | # These lines can be re-ordered; they are executed from top to bottom.
 94 | #
 95 | # If you remove a line here THAT COMMIT WILL BE LOST.
 96 | #
 97 | # However, if you remove everything, the rebase will be aborted.
 98 | #
 99 | # Note that empty commits are commented out
100 | ```
101 | 
102 | Once you have finished editing what to do with every commit save the file and Git will proceed with the rebase process, respecting your configuration.
103 | 
104 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
105 | 
106 | ## Task
107 | 
108 | Rebase two branches and solve the conflict by adding a new different line:
109 | ```
110 | git checkout rebase-lesson/onto-branch # To create a local branch
111 | git checkout rebase-lesson/base-branch
112 | git rebase rebase-lesson/onto-branch
113 | ```
114 | 
115 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
116 | 


--------------------------------------------------------------------------------
/exercises/git_push/problem.md:
--------------------------------------------------------------------------------
  1 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
  2 | 
  3 | ## Description
  4 | 
  5 | We've learned how to get other peoples changes with git fetch. It's time to share with them your own work using `git push`. This command will send your changes to a Git server for others to see.
  6 | 
  7 | First things first, you won't be able to push to the remote you added previously. That is because `https://github.com/karumi/learnyougit` have restricted write access; only us, the karumies, can upload stuff there. In order to learn how the push command works and pass this lesson, you will need to fork that repository. In short, forking a repository means creating a copy of that repository under your control where you will have access to freely push your changes!
  8 | 
  9 | To fork a repository you can follow the official GitHub guide: `https://help.github.com/articles/fork-a-repo/`. Once you successfully forked the `learnyougit` repository, add it to your remotes with `git remote add my-fork git@github.com:{your-user}/learnyougit.git` and you are ready to go! Let's continue with the lesson.
 10 | 
 11 | There are several options to configure what changes you are going to upload but in general, you usually want to send a single branch. This can be done with the command `git push {remote-name} {branch-name}`. Try it now, once it finishes, you will see your branch and all its commits directly from GitHub. By default, Git will use the "smart" protocol to upload only the things that are not already uploaded.
 12 | 
 13 | Is this it? That's everything you need to know to push things? Well... it's not. If you are working completely alone in a project you probably won't need anything else, but, if you work with other people you will probably end up having conflicts with their work. What happens if Alice and Bob are working in the same branch and in the same file? Imagine Alice has pushed her changes to server and right after that, Bob wants to do the same. Git will warn him that it's not possible with a message like:
 14 | 
 15 | ```
 16 | To git@github.com:Karumi/learnyougit.git
 17 |  ! [rejected]        master -> master (non-fast-forward)
 18 | error: failed to push some refs to 'git@github.com:Karumi/learnyougit.git'
 19 | hint: Updates were rejected because the tip of your current branch is behind
 20 | hint: its remote counterpart. Integrate the remote changes (e.g.
 21 | hint: 'git pull ...') before pushing again.
 22 | hint: See the 'Note about fast-forwards' in 'git push --help' for details.
 23 | ```
 24 | 
 25 | In this situation, Bob will need to solve the conflicts in his computer (we will see how to do this in the following lesson) before retrying the push operation. There is another possibility, Bob can discard Alice work and upload only his changes with the `-f` or `--force` option. This option should be used carefully and only when you know that the commits you are discarding can be safely removed.
 26 | 
 27 | In the following lessons we will learn how to solve this kind of conflicts so that you don't have to discard others work.
 28 | 
 29 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
 30 | 
 31 | ## In-depth
 32 | 
 33 | When you push a branch, Git will compare which commits are already present in the remote and ignore them. There are two possibilities with the remaining commits:
 34 | * All new commits are on top of the remote branch history, meaning you can safely push everything to make new changes visible to everyone.
 35 | 
 36 | ```
 37 |                  +---------------+
 38 |                  | REMOTE BRANCH |
 39 |                  +-------+-------+
 40 |                          |
 41 |                          V
 42 | +-----------+      +-----------+      +-----------+
 43 | | COMMIT #1 |<-----+ COMMIT #2 |<-----+ COMMIT #3 |
 44 | +-----------+      +-----------+      +-----------+
 45 |                                             A
 46 |                                             |
 47 |                                     +-------+------+
 48 |                                     | LOCAL BRANCH |
 49 |                                     +--------------+
 50 | ```
 51 | {green}BEFORE PUSHING{/green}
 52 | {green}- - - - - - - - - - - - - - - - - - - - - - - - - - - -{/green}
 53 | {green}AFTER PUSHING{/green}
 54 | ```
 55 |                                     +---------------+
 56 |                                     | REMOTE BRANCH |
 57 |                                     +-------+-------+
 58 |                                             |
 59 |                                             V
 60 | +-----------+      +-----------+      +-----------+
 61 | | COMMIT #1 |<-----+ COMMIT #2 |<-----+ COMMIT #3 |
 62 | +-----------+      +-----------+      +-----------+
 63 |                                             A
 64 |                                             |
 65 |                                     +-------+------+
 66 |                                     | LOCAL BRANCH |
 67 |                                     +--------------+
 68 | ```
 69 | * Your local branch doesn't share all its history with the remote branch. That'd mean that your history diverges at some point from the one stored in server. Git will ask you to either solve the issue locally, respecting the server history, or to forget server's history and use yours instead.
 70 | 
 71 | ```
 72 |                  +---------------+
 73 |                  | REMOTE BRANCH |
 74 |                  +-------+-------+
 75 |                          |
 76 |                          V
 77 | +-----------+      +-----------+
 78 | | COMMIT #1 |<--+--+ COMMIT #2 |
 79 | +-----------+   |  +-----------+
 80 |                 |
 81 |                 |  +-----------+
 82 |                 +--+ COMMIT #4 |
 83 |                    +-----------+
 84 |                          A
 85 |                          |
 86 |                  +-------+------+
 87 |                  | LOCAL BRANCH |
 88 |                  +--------------+
 89 | ```
 90 | {green}BEFORE PUSH --FORCE{/green}
 91 | {green}- - - - - - - - - - - - - - - - - - - - - - - - - - - -{/green}
 92 | {green}AFTER PUSH --FORCE{/green}
 93 | ```
 94 |                  +---------------+
 95 |                  | REMOTE BRANCH |
 96 |                  +-------+-------+
 97 |                          |
 98 |                          V
 99 | +-----------+      +-----------+
100 | | COMMIT #1 |<-----+ COMMIT #4 |
101 | +-----------+      +-----------+
102 |                          A
103 |                          |
104 |                  +-------+------+
105 |                  | LOCAL BRANCH |
106 |                  +--------------+
107 | ```
108 | 
109 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
110 | 
111 | ## Task
112 | 
113 | Push your changes to your own forked repository
114 | ```
115 | git remote add my-fork {fork-url}
116 | git push my-fork my-branch
117 | ```
118 | 
119 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
120 | 


--------------------------------------------------------------------------------
/stylesheets/stylesheet.css:
--------------------------------------------------------------------------------
  1 | * {
  2 |   box-sizing: border-box; }
  3 | 
  4 | body {
  5 |   padding: 0;
  6 |   margin: 0;
  7 |   font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
  8 |   font-size: 16px;
  9 |   line-height: 1.5;
 10 |   color: #606c71; }
 11 | 
 12 | a {
 13 |   color: #1e6bb8;
 14 |   text-decoration: none; }
 15 |   a:hover {
 16 |     text-decoration: underline; }
 17 | 
 18 | .btn {
 19 |   display: inline-block;
 20 |   margin-bottom: 1rem;
 21 |   color: rgba(255, 255, 255, 0.7);
 22 |   background-color: rgba(255, 255, 255, 0.08);
 23 |   border-color: rgba(255, 255, 255, 0.2);
 24 |   border-style: solid;
 25 |   border-width: 1px;
 26 |   border-radius: 0.3rem;
 27 |   transition: color 0.2s, background-color 0.2s, border-color 0.2s; }
 28 |   .btn + .btn {
 29 |     margin-left: 1rem; }
 30 | 
 31 | .btn:hover {
 32 |   color: rgba(255, 255, 255, 0.8);
 33 |   text-decoration: none;
 34 |   background-color: rgba(255, 255, 255, 0.2);
 35 |   border-color: rgba(255, 255, 255, 0.3); }
 36 | 
 37 | @media screen and (min-width: 64em) {
 38 |   .btn {
 39 |     padding: 0.75rem 1rem; } }
 40 | 
 41 | @media screen and (min-width: 42em) and (max-width: 64em) {
 42 |   .btn {
 43 |     padding: 0.6rem 0.9rem;
 44 |     font-size: 0.9rem; } }
 45 | 
 46 | @media screen and (max-width: 42em) {
 47 |   .btn {
 48 |     display: block;
 49 |     width: 100%;
 50 |     padding: 0.75rem;
 51 |     font-size: 0.9rem; }
 52 |     .btn + .btn {
 53 |       margin-top: 1rem;
 54 |       margin-left: 0; } }
 55 | 
 56 | .page-header {
 57 |   color: #fff;
 58 |   text-align: center;
 59 |   background-color: #159957;
 60 |   background-image: linear-gradient(120deg, #155799, #159957); }
 61 | 
 62 | @media screen and (min-width: 64em) {
 63 |   .page-header {
 64 |     padding: 5rem 6rem; } }
 65 | 
 66 | @media screen and (min-width: 42em) and (max-width: 64em) {
 67 |   .page-header {
 68 |     padding: 3rem 4rem; } }
 69 | 
 70 | @media screen and (max-width: 42em) {
 71 |   .page-header {
 72 |     padding: 2rem 1rem; } }
 73 | 
 74 | .project-name {
 75 |   margin-top: 0;
 76 |   margin-bottom: 0.1rem; }
 77 | 
 78 | @media screen and (min-width: 64em) {
 79 |   .project-name {
 80 |     font-size: 3.25rem; } }
 81 | 
 82 | @media screen and (min-width: 42em) and (max-width: 64em) {
 83 |   .project-name {
 84 |     font-size: 2.25rem; } }
 85 | 
 86 | @media screen and (max-width: 42em) {
 87 |   .project-name {
 88 |     font-size: 1.75rem; } }
 89 | 
 90 | .project-tagline {
 91 |   margin-bottom: 2rem;
 92 |   font-weight: normal;
 93 |   opacity: 0.7; }
 94 | 
 95 | @media screen and (min-width: 64em) {
 96 |   .project-tagline {
 97 |     font-size: 1.25rem; } }
 98 | 
 99 | @media screen and (min-width: 42em) and (max-width: 64em) {
100 |   .project-tagline {
101 |     font-size: 1.15rem; } }
102 | 
103 | @media screen and (max-width: 42em) {
104 |   .project-tagline {
105 |     font-size: 1rem; } }
106 | 
107 | .main-content :first-child {
108 |   margin-top: 0; }
109 | .main-content img {
110 |   max-width: 100%; }
111 | .main-content h1, .main-content h2, .main-content h3, .main-content h4, .main-content h5, .main-content h6 {
112 |   margin-top: 2rem;
113 |   margin-bottom: 1rem;
114 |   font-weight: normal;
115 |   color: #159957; }
116 | .main-content p {
117 |   margin-bottom: 1em; }
118 | .main-content code {
119 |   padding: 2px 4px;
120 |   font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
121 |   font-size: 0.9rem;
122 |   color: #383e41;
123 |   background-color: #f3f6fa;
124 |   border-radius: 0.3rem; }
125 | .main-content pre {
126 |   padding: 0.8rem;
127 |   margin-top: 0;
128 |   margin-bottom: 1rem;
129 |   font: 1rem Consolas, "Liberation Mono", Menlo, Courier, monospace;
130 |   color: #567482;
131 |   word-wrap: normal;
132 |   background-color: #f3f6fa;
133 |   border: solid 1px #dce6f0;
134 |   border-radius: 0.3rem; }
135 |   .main-content pre > code {
136 |     padding: 0;
137 |     margin: 0;
138 |     font-size: 0.9rem;
139 |     color: #567482;
140 |     word-break: normal;
141 |     white-space: pre;
142 |     background: transparent;
143 |     border: 0; }
144 | .main-content .highlight {
145 |   margin-bottom: 1rem; }
146 |   .main-content .highlight pre {
147 |     margin-bottom: 0;
148 |     word-break: normal; }
149 | .main-content .highlight pre, .main-content pre {
150 |   padding: 0.8rem;
151 |   overflow: auto;
152 |   font-size: 0.9rem;
153 |   line-height: 1.45;
154 |   border-radius: 0.3rem; }
155 | .main-content pre code, .main-content pre tt {
156 |   display: inline;
157 |   max-width: initial;
158 |   padding: 0;
159 |   margin: 0;
160 |   overflow: initial;
161 |   line-height: inherit;
162 |   word-wrap: normal;
163 |   background-color: transparent;
164 |   border: 0; }
165 |   .main-content pre code:before, .main-content pre code:after, .main-content pre tt:before, .main-content pre tt:after {
166 |     content: normal; }
167 | .main-content ul, .main-content ol {
168 |   margin-top: 0; }
169 | .main-content blockquote {
170 |   padding: 0 1rem;
171 |   margin-left: 0;
172 |   color: #819198;
173 |   border-left: 0.3rem solid #dce6f0; }
174 |   .main-content blockquote > :first-child {
175 |     margin-top: 0; }
176 |   .main-content blockquote > :last-child {
177 |     margin-bottom: 0; }
178 | .main-content table {
179 |   display: block;
180 |   width: 100%;
181 |   overflow: auto;
182 |   word-break: normal;
183 |   word-break: keep-all; }
184 |   .main-content table th {
185 |     font-weight: bold; }
186 |   .main-content table th, .main-content table td {
187 |     padding: 0.5rem 1rem;
188 |     border: 1px solid #e9ebec; }
189 | .main-content dl {
190 |   padding: 0; }
191 |   .main-content dl dt {
192 |     padding: 0;
193 |     margin-top: 1rem;
194 |     font-size: 1rem;
195 |     font-weight: bold; }
196 |   .main-content dl dd {
197 |     padding: 0;
198 |     margin-bottom: 1rem; }
199 | .main-content hr {
200 |   height: 2px;
201 |   padding: 0;
202 |   margin: 1rem 0;
203 |   background-color: #eff0f1;
204 |   border: 0; }
205 | 
206 | @media screen and (min-width: 64em) {
207 |   .main-content {
208 |     max-width: 64rem;
209 |     padding: 2rem 6rem;
210 |     margin: 0 auto;
211 |     font-size: 1.1rem; } }
212 | 
213 | @media screen and (min-width: 42em) and (max-width: 64em) {
214 |   .main-content {
215 |     padding: 2rem 4rem;
216 |     font-size: 1.1rem; } }
217 | 
218 | @media screen and (max-width: 42em) {
219 |   .main-content {
220 |     padding: 2rem 1rem;
221 |     font-size: 1rem; } }
222 | 
223 | .site-footer {
224 |   padding-top: 2rem;
225 |   margin-top: 2rem;
226 |   border-top: solid 1px #eff0f1; }
227 | 
228 | .site-footer-owner {
229 |   display: block;
230 |   font-weight: bold; }
231 | 
232 | .site-footer-credits {
233 |   color: #819198; }
234 | 
235 | @media screen and (min-width: 64em) {
236 |   .site-footer {
237 |     font-size: 1rem; } }
238 | 
239 | @media screen and (min-width: 42em) and (max-width: 64em) {
240 |   .site-footer {
241 |     font-size: 1rem; } }
242 | 
243 | @media screen and (max-width: 42em) {
244 |   .site-footer {
245 |     font-size: 0.9rem; } }
246 | 


--------------------------------------------------------------------------------
/exercises/git_reset/problem.md:
--------------------------------------------------------------------------------
  1 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
  2 | 
  3 | ## Description
  4 | 
  5 | We need to make a stop in the road to explain one of the most useful tools in Git, that is, `git reset`. Generally speaking, this tool lets you take files from one commit or branch and bring them to your working directory.
  6 | 
  7 | There is a lot to say about `git reset`, if you feel like learning how it works, go directly to the `Internals` section. If not, here are some useful examples of how git reset can be used.
  8 | 
  9 | `git reset HEAD` "Unstages" changes. It can be seen as the opposite operation of `git add`.
 10 | `git reset --hard HEAD` Cleans up all your current work, staged or not (Be careful, this means you won't be able to recover your changes).
 11 | `git reset --soft HEAD~` Moves your branch to the previous commit. All the changes in the current commit will be "moved" to the staging area.
 12 | `git reset --hard {commit|branch}` Moves your current branch to point to the specified commit or branch. Cleans your current changes.
 13 | 
 14 | Just a quick note on the `HEAD` notation we used. Besides using branch names and commit hashes, Git can also resolve commits by moving relatively to other commits. `HEAD` means the commit our current branch is pointing to. The `~` modifier is telling Git to use the parent commit of whatever is suffixing, `HEAD~` is the parent of the commit pointed by HEAD but we can also use `master~` or even `5628cd3~`. You can use the `~` operator as many times as you want. For example, this is a valid commit `HEAD~~~~~`. However there is a shorter way of writing that: `HEAD~5`. There are several other ways of referencing commits, you can find more details in https://git-scm.com/book/en/v2/Git-Tools-Revision-Selection
 15 | 
 16 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
 17 | 
 18 | ## In-depth
 19 | 
 20 | We already learnt how Git has a special place for every change that is about to be committed: the index or the staging area. Besides that, Git also handles two more places, sort of speak. One is the working directory area, that corresponds with all the files living in your filesystem. The last one is whatever your HEAD pointer is pointing to.
 21 | 
 22 | All your git commands use or modify at least one of the three areas in one way or another. We can see how they evolve when doing regular work.
 23 | 
 24 | {green}> touch new.txt{/green}
 25 | ```
 26 | +-----------+---------+---------+
 27 | |  WORKING  |  INDEX  |  HEAD   |
 28 | | DIRECTORY |         |         |
 29 | +-----------+---------+---------+
 30 | | new.txt   |         |         |
 31 | +-----------+---------+---------+
 32 | ```
 33 | {green}> git add new.txt{/green}
 34 | ```
 35 | +-----------+---------+---------+
 36 | |  WORKING  |  INDEX  |  HEAD   |
 37 | | DIRECTORY |         |         |
 38 | +-----------+---------+---------+
 39 | | new.txt   | new.txt |         |
 40 | +-----------+---------+---------+
 41 | ```
 42 | {green}> git commit{/green}
 43 | ```
 44 | +-----------+---------+---------+
 45 | |  WORKING  |  INDEX  |  HEAD   |
 46 | | DIRECTORY |         |         |
 47 | +-----------+---------+---------+
 48 | | new.txt   | new.txt | new.txt |
 49 | +-----------+---------+---------+
 50 | ```
 51 | 
 52 | What does `git reset` have to do with all this? It basically is the tool that lets you modify your repository areas as you wish.
 53 | 
 54 | Reset can be thought as a three-steps process. Each step affecting one of the three described areas. Imagine we start with the following state:
 55 | 
 56 | ```
 57 |                      +------+
 58 |                      | HEAD |
 59 |                      +---+--+
 60 |                          |
 61 |                          V
 62 |                    +-----------+
 63 |                    | BRANCH #1 |
 64 |                    +-----+-----+
 65 |                          |
 66 |                          V
 67 | +-----------+      +-----------+
 68 | | COMMIT #1 |<-----+ COMMIT #2 |
 69 | +-----------+      +-----------+
 70 | ```
 71 | 
 72 | ```
 73 | +-----------+---------+---------+
 74 | |  WORKING  |  INDEX  |  HEAD   |
 75 | | DIRECTORY |         |         |
 76 | +-----------+---------+---------+
 77 | | v2.txt    | v2.txt  | v2.txt  |
 78 | +-----------+---------+---------+
 79 | ```
 80 | 
 81 | ### Step 1: Update your HEAD
 82 | 
 83 | Takes your current branch (the one HEAD is pointing to) and moves it to the specified commit. Notice how the HEAD area now has a different version of the files.
 84 | 
 85 | ```
 86 |   +------+
 87 |   | HEAD |
 88 |   +---+--+
 89 |       |
 90 |       V
 91 | +-----------+
 92 | | BRANCH #1 |
 93 | +-----+-----+
 94 |       |
 95 |       V
 96 | +-----------+      +-----------+
 97 | | COMMIT #1 |<-----+ COMMIT #2 |
 98 | +-----------+      +-----------+
 99 | ```
100 | 
101 | ```
102 | +-----------+---------+---------+
103 | |  WORKING  |  INDEX  |  HEAD   |
104 | | DIRECTORY |         |         |
105 | +-----------+---------+---------+
106 | | v2.txt    | v2.txt  | v1.txt  |
107 | +-----------+---------+---------+
108 | ```
109 | 
110 | ### Step 2: Update your index
111 | 
112 | Now Git resets your index area to be exactly like the specified commit.
113 | 
114 | ```
115 | +-----------+---------+---------+
116 | |  WORKING  |  INDEX  |  HEAD   |
117 | | DIRECTORY |         |         |
118 | +-----------+---------+---------+
119 | | v2.txt    | v1.txt  | v1.txt  |
120 | +-----------+---------+---------+
121 | ```
122 | 
123 | ### Step 3: Update your working directory
124 | 
125 | Finally, it makes your working directory looks exactly like the specified commit. This means it will wipe out whatever your files were and replace them by the ones you stored in the given commit.
126 | 
127 | ```
128 | +-----------+---------+---------+
129 | |  WORKING  |  INDEX  |  HEAD   |
130 | | DIRECTORY |         |         |
131 | +-----------+---------+---------+
132 | | v1.txt    | v1.txt  | v1.txt  |
133 | +-----------+---------+---------+
134 | ```
135 | 
136 | In which step the reset command stops is up to you and is configurable. `--soft` Stops after executing step 1, `--mixed` (or nothing, being the default option) stops after executing step 2, `--hard` executes the three steps.
137 | 
138 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
139 | 
140 | Let's go back to some of the examples I wrote before and see what do they do:
141 | 
142 | `git reset HEAD`
143 | 
144 | In this case, the `--mixed` option is used because is the default configuration.
145 |     [1] Git will first reset the current branch to point to whatever is already pointing (that means it does nothing in the first step).
146 |     [2] Git will leave the index exactly as it is in the current commit. That means all the changes you included with `git add` won't be staged.
147 | 
148 | `git reset --soft HEAD~`
149 | 
150 |     [1] Git will move the current branch to the previous commit. Because your index and your staging area won't be affected that means that you will still have all your changes present in both areas. This is why the changes of the previous HEAD will be displayed in your index along with the modifications you already had in your working directory.
151 | 
152 | `git reset --hard {commit|branch}`
153 | 
154 |     [1] Git will move your current branch to point to the specified commit.
155 |     [2] It will then update your staging area to look exactly as the selected commit.
156 |     [3] Finally, it will make your working directory exactly as it is in the commit.
157 | 
158 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
159 | 
160 | ## Task
161 | 
162 | Create a new commit in your current branch with
163 | 
164 | `touch {some-file}`
165 | `git add {some-file}`
166 | `git commit -m "Add a brand new file"`
167 | 
168 | Then move to the `master` branch
169 | 
170 | `git checkout master`
171 | 
172 | Reset `master` to point to the new commit
173 | 
174 | `git reset --hard {branch-name}`
175 | 
176 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
177 | 


--------------------------------------------------------------------------------
/exercises/git_merge/problem.md:
--------------------------------------------------------------------------------
  1 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
  2 | 
  3 | ## Description
  4 | 
  5 | In a previous lesson, we learnt how to upload your changes and we talked about how your work can have conflicts with others work. The main tool that lets you solve this kind of situations is `git merge`. In essence, the merge command just unifies two branches history into one:
  6 | 
  7 | ```
  8 |                      +------+
  9 |                      | HEAD |
 10 |                      +---+--+
 11 |                          |
 12 |                          V
 13 |                    +-----------+
 14 |                    | BRANCH #1 |
 15 |                    +-----+-----+
 16 |                          |
 17 |                          V
 18 | +-----------+      +-----------+
 19 | | COMMIT #1 |<--+--+ COMMIT #2 |
 20 | +-----------+   |  +-----------+
 21 |                 |
 22 |                 |  +-----------+
 23 |                 +--+ COMMIT #3 |
 24 |                    +-----------+
 25 |                          A
 26 |                          |
 27 |                    +-----+-----+
 28 |                    | BRANCH #2 |
 29 |                    +-----------+
 30 | ```
 31 | {green}BEFORE MERGING BRANCH #2 INTO BRANCH #1{/green}
 32 | {green}- - - - - - - - - - - - - - - - - - - - - - - - - - - -{/green}
 33 | {green}AFTER MERGING BRANCH #2 INTO BRANCH #1{/green}
 34 | ```
 35 |                                         +------+
 36 |                                         | HEAD |
 37 |                                         +---+--+
 38 |                                             |
 39 |                                             V
 40 |                                       +-----------+
 41 |                                       | BRANCH #1 |
 42 |                                       +-----+-----+
 43 |                                             |
 44 |                                             V
 45 | +-----------+      +-----------+      +-----------+
 46 | | COMMIT #1 |<--+--+ COMMIT #2 |<--+--+ COMMIT #4 |
 47 | +-----------+   |  +-----------+   |  +-----------+
 48 |                 |                  |
 49 |                 |  +-----------+   |
 50 |                 +--+ COMMIT #3 |<--+
 51 |                    +-----------+
 52 |                          A
 53 |                          |
 54 |                    +-----+-----+
 55 |                    | BRANCH #2 |
 56 |                    +-----------+
 57 | ```
 58 | 
 59 | One important thing to notice is that we only modify the branch we are in. The branch we are merging from stays unmodified. In the diagram above we can see how Git creates a new commit with two parents called a merge commit. This merge commit contains a mix of the files of the two branches.
 60 | 
 61 | The merge process we've seen is a rather complex one. There are other situations where Git can apply a more simple solution. Imagine we now want to merge `BRANCH #1` into `BRANCH #2`, that means, we want `BRANCH #2` to share history with `BRANCH #1`. In that case, by default, Git will not create a new commit but will just move forwards `BRANCH #2`.
 62 | 
 63 | ```
 64 |                                       +-----------+
 65 |                                       | BRANCH #1 |
 66 |                                       +-----+-----+
 67 |                                             |
 68 |                                             V
 69 | +-----------+      +-----------+      +-----------+
 70 | | COMMIT #1 |<--+--+ COMMIT #2 |<--+--+ COMMIT #4 |
 71 | +-----------+   |  +-----------+   |  +-----------+
 72 |                 |                  |
 73 |                 |  +-----------+   |
 74 |                 +--+ COMMIT #3 |<--+
 75 |                    +-----------+
 76 |                          A
 77 |                          |
 78 |                    +-----+-----+
 79 |                    | BRANCH #2 |
 80 |                    +-----------+
 81 |                          A
 82 |                          |
 83 |                      +---+--+
 84 |                      | HEAD |
 85 |                      +------+
 86 | ```
 87 | {green}BEFORE MERGE BRANCH #1 INTO BRANCH #2{/green}
 88 | {green}- - - - - - - - - - - - - - - - - - - - - - - - - - - -{/green}
 89 | {green}AFTER MERGE BRANCH #1 INTO BRANCH #2{/green}
 90 | ```
 91 |                                       +-----------+
 92 |                                       | BRANCH #1 |
 93 |                                       +-----+-----+
 94 |                                             |
 95 |                                             V
 96 | +-----------+      +-----------+      +-----------+
 97 | | COMMIT #1 |<--+--+ COMMIT #2 |<--+--+ COMMIT #4 |
 98 | +-----------+   |  +-----------+   |  +-----------+
 99 |                 |                  |        A
100 |                 |  +-----------+   |        |
101 |                 +--+ COMMIT #3 |<--+        |
102 |                    +-----------+            |
103 |                                       +-----+-----+
104 |                                       | BRANCH #2 |
105 |                                       +-----------+
106 |                                             A
107 |                                             |
108 |                                         +---+--+
109 |                                         | HEAD |
110 |                                         +------+
111 | ```
112 | 
113 | There might be conflicts when creating the merge commit if the two branches have modifications over the same files. When this happens, Git will suspend the merge task and let you know which files have conflicts with a message similar to the following:
114 | 
115 | ```
116 | Auto-merging something
117 | CONFLICT (content): Merge conflict in file.txt
118 | Recorded preimage for 'file.txt'
119 | Automatic merge failed; fix conflicts and then commit the result.
120 | ```
121 | 
122 | When this happens, Git marks the conflicting lines with marking characters:
123 | 
124 | ```
125 | <<<<<<< HEAD
126 | Something I wrote just now
127 | =======
128 | Something else I wrote right now
129 | >>>>>>> master
130 | ```
131 | 
132 | The top part is what your current branch has, in this case, the sentence `Something I wrote just now`. The bottom part is the contents of the branch you are merging to. Once you decide which version you like more (you can even create a mix of the two), remove the conflict marks and add the file to your index with `git add`. Remember Git just suspended the merge task? When you finish solving conflicts just commit your changes with `git commit`. Git will know that your commit has been built from a merge and will automatically set a message for you.
133 | 
134 | Congratulations, now you know how to collaborate with others more efficiently! There is another way to mix your work with others and that is `git rebase`, we will see how it works in our next lesson.
135 | 
136 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
137 | 
138 | ## In-depth
139 | 
140 | How the merge tool works can be summarized in the following rules:
141 | 1. If one of the branches is subhistory of the other (that means that all commits of one of the two branches are in the other branch as well):
142 |   * Apply `fast-forward`. If your current branch is the one behind, Git will only move it forwards to point to the same commit the merged branch is pointing to. If your current branch already contains all the other branch commits, then Git doesn't modify your branch.
143 | 2. Else:
144 |   * Create a new commit with two parents, your current branch and the branch being merged.
145 | 
146 | 
147 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
148 | 
149 | ## Task
150 | 
151 | Merge two branches where fast-forward can be applied:
152 | ```
153 | git checkout merge-lesson/fast-foward-branch # To create a local branch
154 | git checkout merge-lesson/base-branch
155 | git merge merge-lesson/fast-forward-branch
156 | ```
157 | 
158 | Merge two branches with conflicts and solve them taking all the changes from the conflicts-branch:
159 | ```
160 | git checkout merge-lesson/conflicts-branch # To create a local branch
161 | git checkout merge-lesson/base-branch
162 | git merge merge-lesson/conflicts-branch
163 | ```
164 | 
165 | {cyan}──────────────────────────────────────────────────────────────────────{/cyan}
166 | 


--------------------------------------------------------------------------------
/stylesheets/normalize.css:
--------------------------------------------------------------------------------
  1 | /*! normalize.css v3.0.2 | MIT License | git.io/normalize */
  2 | 
  3 | /**
  4 |  * 1. Set default font family to sans-serif.
  5 |  * 2. Prevent iOS text size adjust after orientation change, without disabling
  6 |  *    user zoom.
  7 |  */
  8 | 
  9 | html {
 10 |   font-family: sans-serif; /* 1 */
 11 |   -ms-text-size-adjust: 100%; /* 2 */
 12 |   -webkit-text-size-adjust: 100%; /* 2 */
 13 | }
 14 | 
 15 | /**
 16 |  * Remove default margin.
 17 |  */
 18 | 
 19 | body {
 20 |   margin: 0;
 21 | }
 22 | 
 23 | /* HTML5 display definitions
 24 |    ========================================================================== */
 25 | 
 26 | /**
 27 |  * Correct `block` display not defined for any HTML5 element in IE 8/9.
 28 |  * Correct `block` display not defined for `details` or `summary` in IE 10/11
 29 |  * and Firefox.
 30 |  * Correct `block` display not defined for `main` in IE 11.
 31 |  */
 32 | 
 33 | article,
 34 | aside,
 35 | details,
 36 | figcaption,
 37 | figure,
 38 | footer,
 39 | header,
 40 | hgroup,
 41 | main,
 42 | menu,
 43 | nav,
 44 | section,
 45 | summary {
 46 |   display: block;
 47 | }
 48 | 
 49 | /**
 50 |  * 1. Correct `inline-block` display not defined in IE 8/9.
 51 |  * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
 52 |  */
 53 | 
 54 | audio,
 55 | canvas,
 56 | progress,
 57 | video {
 58 |   display: inline-block; /* 1 */
 59 |   vertical-align: baseline; /* 2 */
 60 | }
 61 | 
 62 | /**
 63 |  * Prevent modern browsers from displaying `audio` without controls.
 64 |  * Remove excess height in iOS 5 devices.
 65 |  */
 66 | 
 67 | audio:not([controls]) {
 68 |   display: none;
 69 |   height: 0;
 70 | }
 71 | 
 72 | /**
 73 |  * Address `[hidden]` styling not present in IE 8/9/10.
 74 |  * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
 75 |  */
 76 | 
 77 | [hidden],
 78 | template {
 79 |   display: none;
 80 | }
 81 | 
 82 | /* Links
 83 |    ========================================================================== */
 84 | 
 85 | /**
 86 |  * Remove the gray background color from active links in IE 10.
 87 |  */
 88 | 
 89 | a {
 90 |   background-color: transparent;
 91 | }
 92 | 
 93 | /**
 94 |  * Improve readability when focused and also mouse hovered in all browsers.
 95 |  */
 96 | 
 97 | a:active,
 98 | a:hover {
 99 |   outline: 0;
100 | }
101 | 
102 | /* Text-level semantics
103 |    ========================================================================== */
104 | 
105 | /**
106 |  * Address styling not present in IE 8/9/10/11, Safari, and Chrome.
107 |  */
108 | 
109 | abbr[title] {
110 |   border-bottom: 1px dotted;
111 | }
112 | 
113 | /**
114 |  * Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
115 |  */
116 | 
117 | b,
118 | strong {
119 |   font-weight: bold;
120 | }
121 | 
122 | /**
123 |  * Address styling not present in Safari and Chrome.
124 |  */
125 | 
126 | dfn {
127 |   font-style: italic;
128 | }
129 | 
130 | /**
131 |  * Address variable `h1` font-size and margin within `section` and `article`
132 |  * contexts in Firefox 4+, Safari, and Chrome.
133 |  */
134 | 
135 | h1 {
136 |   font-size: 2em;
137 |   margin: 0.67em 0;
138 | }
139 | 
140 | /**
141 |  * Address styling not present in IE 8/9.
142 |  */
143 | 
144 | mark {
145 |   background: #ff0;
146 |   color: #000;
147 | }
148 | 
149 | /**
150 |  * Address inconsistent and variable font size in all browsers.
151 |  */
152 | 
153 | small {
154 |   font-size: 80%;
155 | }
156 | 
157 | /**
158 |  * Prevent `sub` and `sup` affecting `line-height` in all browsers.
159 |  */
160 | 
161 | sub,
162 | sup {
163 |   font-size: 75%;
164 |   line-height: 0;
165 |   position: relative;
166 |   vertical-align: baseline;
167 | }
168 | 
169 | sup {
170 |   top: -0.5em;
171 | }
172 | 
173 | sub {
174 |   bottom: -0.25em;
175 | }
176 | 
177 | /* Embedded content
178 |    ========================================================================== */
179 | 
180 | /**
181 |  * Remove border when inside `a` element in IE 8/9/10.
182 |  */
183 | 
184 | img {
185 |   border: 0;
186 | }
187 | 
188 | /**
189 |  * Correct overflow not hidden in IE 9/10/11.
190 |  */
191 | 
192 | svg:not(:root) {
193 |   overflow: hidden;
194 | }
195 | 
196 | /* Grouping content
197 |    ========================================================================== */
198 | 
199 | /**
200 |  * Address margin not present in IE 8/9 and Safari.
201 |  */
202 | 
203 | figure {
204 |   margin: 1em 40px;
205 | }
206 | 
207 | /**
208 |  * Address differences between Firefox and other browsers.
209 |  */
210 | 
211 | hr {
212 |   box-sizing: content-box;
213 |   height: 0;
214 | }
215 | 
216 | /**
217 |  * Contain overflow in all browsers.
218 |  */
219 | 
220 | pre {
221 |   overflow: auto;
222 | }
223 | 
224 | /**
225 |  * Address odd `em`-unit font size rendering in all browsers.
226 |  */
227 | 
228 | code,
229 | kbd,
230 | pre,
231 | samp {
232 |   font-family: monospace, monospace;
233 |   font-size: 1em;
234 | }
235 | 
236 | /* Forms
237 |    ========================================================================== */
238 | 
239 | /**
240 |  * Known limitation: by default, Chrome and Safari on OS X allow very limited
241 |  * styling of `select`, unless a `border` property is set.
242 |  */
243 | 
244 | /**
245 |  * 1. Correct color not being inherited.
246 |  *    Known issue: affects color of disabled elements.
247 |  * 2. Correct font properties not being inherited.
248 |  * 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
249 |  */
250 | 
251 | button,
252 | input,
253 | optgroup,
254 | select,
255 | textarea {
256 |   color: inherit; /* 1 */
257 |   font: inherit; /* 2 */
258 |   margin: 0; /* 3 */
259 | }
260 | 
261 | /**
262 |  * Address `overflow` set to `hidden` in IE 8/9/10/11.
263 |  */
264 | 
265 | button {
266 |   overflow: visible;
267 | }
268 | 
269 | /**
270 |  * Address inconsistent `text-transform` inheritance for `button` and `select`.
271 |  * All other form control elements do not inherit `text-transform` values.
272 |  * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
273 |  * Correct `select` style inheritance in Firefox.
274 |  */
275 | 
276 | button,
277 | select {
278 |   text-transform: none;
279 | }
280 | 
281 | /**
282 |  * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
283 |  *    and `video` controls.
284 |  * 2. Correct inability to style clickable `input` types in iOS.
285 |  * 3. Improve usability and consistency of cursor style between image-type
286 |  *    `input` and others.
287 |  */
288 | 
289 | button,
290 | html input[type="button"], /* 1 */
291 | input[type="reset"],
292 | input[type="submit"] {
293 |   -webkit-appearance: button; /* 2 */
294 |   cursor: pointer; /* 3 */
295 | }
296 | 
297 | /**
298 |  * Re-set default cursor for disabled elements.
299 |  */
300 | 
301 | button[disabled],
302 | html input[disabled] {
303 |   cursor: default;
304 | }
305 | 
306 | /**
307 |  * Remove inner padding and border in Firefox 4+.
308 |  */
309 | 
310 | button::-moz-focus-inner,
311 | input::-moz-focus-inner {
312 |   border: 0;
313 |   padding: 0;
314 | }
315 | 
316 | /**
317 |  * Address Firefox 4+ setting `line-height` on `input` using `!important` in
318 |  * the UA stylesheet.
319 |  */
320 | 
321 | input {
322 |   line-height: normal;
323 | }
324 | 
325 | /**
326 |  * It's recommended that you don't attempt to style these elements.
327 |  * Firefox's implementation doesn't respect box-sizing, padding, or width.
328 |  *
329 |  * 1. Address box sizing set to `content-box` in IE 8/9/10.
330 |  * 2. Remove excess padding in IE 8/9/10.
331 |  */
332 | 
333 | input[type="checkbox"],
334 | input[type="radio"] {
335 |   box-sizing: border-box; /* 1 */
336 |   padding: 0; /* 2 */
337 | }
338 | 
339 | /**
340 |  * Fix the cursor style for Chrome's increment/decrement buttons. For certain
341 |  * `font-size` values of the `input`, it causes the cursor style of the
342 |  * decrement button to change from `default` to `text`.
343 |  */
344 | 
345 | input[type="number"]::-webkit-inner-spin-button,
346 | input[type="number"]::-webkit-outer-spin-button {
347 |   height: auto;
348 | }
349 | 
350 | /**
351 |  * 1. Address `appearance` set to `searchfield` in Safari and Chrome.
352 |  * 2. Address `box-sizing` set to `border-box` in Safari and Chrome
353 |  *    (include `-moz` to future-proof).
354 |  */
355 | 
356 | input[type="search"] {
357 |   -webkit-appearance: textfield; /* 1 */ /* 2 */
358 |   box-sizing: content-box;
359 | }
360 | 
361 | /**
362 |  * Remove inner padding and search cancel button in Safari and Chrome on OS X.
363 |  * Safari (but not Chrome) clips the cancel button when the search input has
364 |  * padding (and `textfield` appearance).
365 |  */
366 | 
367 | input[type="search"]::-webkit-search-cancel-button,
368 | input[type="search"]::-webkit-search-decoration {
369 |   -webkit-appearance: none;
370 | }
371 | 
372 | /**
373 |  * Define consistent border, margin, and padding.
374 |  */
375 | 
376 | fieldset {
377 |   border: 1px solid #c0c0c0;
378 |   margin: 0 2px;
379 |   padding: 0.35em 0.625em 0.75em;
380 | }
381 | 
382 | /**
383 |  * 1. Correct `color` not being inherited in IE 8/9/10/11.
384 |  * 2. Remove padding so people aren't caught out if they zero out fieldsets.
385 |  */
386 | 
387 | legend {
388 |   border: 0; /* 1 */
389 |   padding: 0; /* 2 */
390 | }
391 | 
392 | /**
393 |  * Remove default vertical scrollbar in IE 8/9/10/11.
394 |  */
395 | 
396 | textarea {
397 |   overflow: auto;
398 | }
399 | 
400 | /**
401 |  * Don't inherit the `font-weight` (applied by a rule above).
402 |  * NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
403 |  */
404 | 
405 | optgroup {
406 |   font-weight: bold;
407 | }
408 | 
409 | /* Tables
410 |    ========================================================================== */
411 | 
412 | /**
413 |  * Remove most spacing between table cells.
414 |  */
415 | 
416 | table {
417 |   border-collapse: collapse;
418 |   border-spacing: 0;
419 | }
420 | 
421 | td,
422 | th {
423 |   padding: 0;
424 | }
425 | 


--------------------------------------------------------------------------------
/LICENSE:
--------------------------------------------------------------------------------
  1 |                                  Apache License
  2 |                            Version 2.0, January 2004
  3 |                         http://www.apache.org/licenses/
  4 | 
  5 |    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
  6 | 
  7 |    1. Definitions.
  8 | 
  9 |       "License" shall mean the terms and conditions for use, reproduction,
 10 |       and distribution as defined by Sections 1 through 9 of this document.
 11 | 
 12 |       "Licensor" shall mean the copyright owner or entity authorized by
 13 |       the copyright owner that is granting the License.
 14 | 
 15 |       "Legal Entity" shall mean the union of the acting entity and all
 16 |       other entities that control, are controlled by, or are under common
 17 |       control with that entity. For the purposes of this definition,
 18 |       "control" means (i) the power, direct or indirect, to cause the
 19 |       direction or management of such entity, whether by contract or
 20 |       otherwise, or (ii) ownership of fifty percent (50%) or more of the
 21 |       outstanding shares, or (iii) beneficial ownership of such entity.
 22 | 
 23 |       "You" (or "Your") shall mean an individual or Legal Entity
 24 |       exercising permissions granted by this License.
 25 | 
 26 |       "Source" form shall mean the preferred form for making modifications,
 27 |       including but not limited to software source code, documentation
 28 |       source, and configuration files.
 29 | 
 30 |       "Object" form shall mean any form resulting from mechanical
 31 |       transformation or translation of a Source form, including but
 32 |       not limited to compiled object code, generated documentation,
 33 |       and conversions to other media types.
 34 | 
 35 |       "Work" shall mean the work of authorship, whether in Source or
 36 |       Object form, made available under the License, as indicated by a
 37 |       copyright notice that is included in or attached to the work
 38 |       (an example is provided in the Appendix below).
 39 | 
 40 |       "Derivative Works" shall mean any work, whether in Source or Object
 41 |       form, that is based on (or derived from) the Work and for which the
 42 |       editorial revisions, annotations, elaborations, or other modifications
 43 |       represent, as a whole, an original work of authorship. For the purposes
 44 |       of this License, Derivative Works shall not include works that remain
 45 |       separable from, or merely link (or bind by name) to the interfaces of,
 46 |       the Work and Derivative Works thereof.
 47 | 
 48 |       "Contribution" shall mean any work of authorship, including
 49 |       the original version of the Work and any modifications or additions
 50 |       to that Work or Derivative Works thereof, that is intentionally
 51 |       submitted to Licensor for inclusion in the Work by the copyright owner
 52 |       or by an individual or Legal Entity authorized to submit on behalf of
 53 |       the copyright owner. For the purposes of this definition, "submitted"
 54 |       means any form of electronic, verbal, or written communication sent
 55 |       to the Licensor or its representatives, including but not limited to
 56 |       communication on electronic mailing lists, source code control systems,
 57 |       and issue tracking systems that are managed by, or on behalf of, the
 58 |       Licensor for the purpose of discussing and improving the Work, but
 59 |       excluding communication that is conspicuously marked or otherwise
 60 |       designated in writing by the copyright owner as "Not a Contribution."
 61 | 
 62 |       "Contributor" shall mean Licensor and any individual or Legal Entity
 63 |       on behalf of whom a Contribution has been received by Licensor and
 64 |       subsequently incorporated within the Work.
 65 | 
 66 |    2. Grant of Copyright License. Subject to the terms and conditions of
 67 |       this License, each Contributor hereby grants to You a perpetual,
 68 |       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
 69 |       copyright license to reproduce, prepare Derivative Works of,
 70 |       publicly display, publicly perform, sublicense, and distribute the
 71 |       Work and such Derivative Works in Source or Object form.
 72 | 
 73 |    3. Grant of Patent License. Subject to the terms and conditions of
 74 |       this License, each Contributor hereby grants to You a perpetual,
 75 |       worldwide, non-exclusive, no-charge, royalty-free, irrevocable
 76 |       (except as stated in this section) patent license to make, have made,
 77 |       use, offer to sell, sell, import, and otherwise transfer the Work,
 78 |       where such license applies only to those patent claims licensable
 79 |       by such Contributor that are necessarily infringed by their
 80 |       Contribution(s) alone or by combination of their Contribution(s)
 81 |       with the Work to which such Contribution(s) was submitted. If You
 82 |       institute patent litigation against any entity (including a
 83 |       cross-claim or counterclaim in a lawsuit) alleging that the Work
 84 |       or a Contribution incorporated within the Work constitutes direct
 85 |       or contributory patent infringement, then any patent licenses
 86 |       granted to You under this License for that Work shall terminate
 87 |       as of the date such litigation is filed.
 88 | 
 89 |    4. Redistribution. You may reproduce and distribute copies of the
 90 |       Work or Derivative Works thereof in any medium, with or without
 91 |       modifications, and in Source or Object form, provided that You
 92 |       meet the following conditions:
 93 | 
 94 |       (a) You must give any other recipients of the Work or
 95 |           Derivative Works a copy of this License; and
 96 | 
 97 |       (b) You must cause any modified files to carry prominent notices
 98 |           stating that You changed the files; and
 99 | 
100 |       (c) You must retain, in the Source form of any Derivative Works
101 |           that You distribute, all copyright, patent, trademark, and
102 |           attribution notices from the Source form of the Work,
103 |           excluding those notices that do not pertain to any part of
104 |           the Derivative Works; and
105 | 
106 |       (d) If the Work includes a "NOTICE" text file as part of its
107 |           distribution, then any Derivative Works that You distribute must
108 |           include a readable copy of the attribution notices contained
109 |           within such NOTICE file, excluding those notices that do not
110 |           pertain to any part of the Derivative Works, in at least one
111 |           of the following places: within a NOTICE text file distributed
112 |           as part of the Derivative Works; within the Source form or
113 |           documentation, if provided along with the Derivative Works; or,
114 |           within a display generated by the Derivative Works, if and
115 |           wherever such third-party notices normally appear. The contents
116 |           of the NOTICE file are for informational purposes only and
117 |           do not modify the License. You may add Your own attribution
118 |           notices within Derivative Works that You distribute, alongside
119 |           or as an addendum to the NOTICE text from the Work, provided
120 |           that such additional attribution notices cannot be construed
121 |           as modifying the License.
122 | 
123 |       You may add Your own copyright statement to Your modifications and
124 |       may provide additional or different license terms and conditions
125 |       for use, reproduction, or distribution of Your modifications, or
126 |       for any such Derivative Works as a whole, provided Your use,
127 |       reproduction, and distribution of the Work otherwise complies with
128 |       the conditions stated in this License.
129 | 
130 |    5. Submission of Contributions. Unless You explicitly state otherwise,
131 |       any Contribution intentionally submitted for inclusion in the Work
132 |       by You to the Licensor shall be under the terms and conditions of
133 |       this License, without any additional terms or conditions.
134 |       Notwithstanding the above, nothing herein shall supersede or modify
135 |       the terms of any separate license agreement you may have executed
136 |       with Licensor regarding such Contributions.
137 | 
138 |    6. Trademarks. This License does not grant permission to use the trade
139 |       names, trademarks, service marks, or product names of the Licensor,
140 |       except as required for reasonable and customary use in describing the
141 |       origin of the Work and reproducing the content of the NOTICE file.
142 | 
143 |    7. Disclaimer of Warranty. Unless required by applicable law or
144 |       agreed to in writing, Licensor provides the Work (and each
145 |       Contributor provides its Contributions) on an "AS IS" BASIS,
146 |       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147 |       implied, including, without limitation, any warranties or conditions
148 |       of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149 |       PARTICULAR PURPOSE. You are solely responsible for determining the
150 |       appropriateness of using or redistributing the Work and assume any
151 |       risks associated with Your exercise of permissions under this License.
152 | 
153 |    8. Limitation of Liability. In no event and under no legal theory,
154 |       whether in tort (including negligence), contract, or otherwise,
155 |       unless required by applicable law (such as deliberate and grossly
156 |       negligent acts) or agreed to in writing, shall any Contributor be
157 |       liable to You for damages, including any direct, indirect, special,
158 |       incidental, or consequential damages of any character arising as a
159 |       result of this License or out of the use or inability to use the
160 |       Work (including but not limited to damages for loss of goodwill,
161 |       work stoppage, computer failure or malfunction, or any and all
162 |       other commercial damages or losses), even if such Contributor
163 |       has been advised of the possibility of such damages.
164 | 
165 |    9. Accepting Warranty or Additional Liability. While redistributing
166 |       the Work or Derivative Works thereof, You may choose to offer,
167 |       and charge a fee for, acceptance of support, warranty, indemnity,
168 |       or other liability obligations and/or rights consistent with this
169 |       License. However, in accepting such obligations, You may act only
170 |       on Your own behalf and on Your sole responsibility, not on behalf
171 |       of any other Contributor, and only if You agree to indemnify,
172 |       defend, and hold each Contributor harmless for any liability
173 |       incurred by, or claims asserted against, such Contributor by reason
174 |       of your accepting any such warranty or additional liability.
175 | 
176 |    END OF TERMS AND CONDITIONS
177 | 
178 |    APPENDIX: How to apply the Apache License to your work.
179 | 
180 |       To apply the Apache License to your work, attach the following
181 |       boilerplate notice, with the fields enclosed by brackets "{}"
182 |       replaced with your own identifying information. (Don't include
183 |       the brackets!)  The text should be enclosed in the appropriate
184 |       comment syntax for the file format. We also recommend that a
185 |       file or class name and description of purpose be included on the
186 |       same "printed page" as the copyright notice for easier
187 |       identification within third-party archives.
188 | 
189 |    Copyright {yyyy} {name of copyright owner}
190 | 
191 |    Licensed under the Apache License, Version 2.0 (the "License");
192 |    you may not use this file except in compliance with the License.
193 |    You may obtain a copy of the License at
194 | 
195 |        http://www.apache.org/licenses/LICENSE-2.0
196 | 
197 |    Unless required by applicable law or agreed to in writing, software
198 |    distributed under the License is distributed on an "AS IS" BASIS,
199 |    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200 |    See the License for the specific language governing permissions and
201 |    limitations under the License.
202 | 


--------------------------------------------------------------------------------