Skip to content
Snippets Groups Projects
Commit 71588fbc authored by Sylvain Arreckx's avatar Sylvain Arreckx
Browse files

Initial release

parents
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 715 additions and 0 deletions
img/linus.jpg 0 → 100644
+ 0
− 0
View file @ 71588fbc
img/linus.jpg

4.17 KiB

img/manual_version_control.png 0 → 100644
+ 0
− 0
View file @ 71588fbc
img/manual_version_control.png

80.3 KiB

img/remote-0-master.png 0 → 100644
+ 0
− 0
View file @ 71588fbc
img/remote-0-master.png

180 KiB

img/remote-1-remote.png 0 → 100644
+ 0
− 0
View file @ 71588fbc
img/remote-1-remote.png

199 KiB

img/remote-2-push.png 0 → 100644
+ 0
− 0
View file @ 71588fbc
img/remote-2-push.png

224 KiB

img/remote-i-state.graffle 0 → 100644
+ 0
− 0
View file @ 71588fbc
File added
index.html 0 → 100644
+ 160
− 0
View file @ 71588fbc
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Débuter avec Git et Github</title>
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<link rel="stylesheet" href="bower_components/reveal.js/css/reveal.min.css">
<link rel="stylesheet" href="bower_components/reveal.js/css/theme/night.css" id="theme">
<link rel="stylesheet" href="css/style.css">
<!-- For syntax highlighting -->
<link rel="stylesheet" href="bower_components/reveal.js/lib/css/zenburn.css" id="highlight-theme">
<!-- If the query includes 'print-pdf', use the PDF print sheet -->
<script>
document.write( '<link rel="stylesheet" href="bower_components/reveal.js/css/print/' + ( window.location.search.match( /print-pdf/gi ) ? 'pdf' : 'paper' ) + '.css" type="text/css" media="print">' );
</script>
<!--[if lt IE 9]>
<script src="lib/js/html5shiv.js"></script>
<![endif]-->
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
</head>
<body>
<div class="reveal">
<div class="slides">
<section data-separator="^\n\n\n"
data-vertical="^\n\n"
data-background="http://25.media.tumblr.com/b03e53931e2264f97a3e93beae6d3053/tumblr_mtw7hple1a1st5lhmo1_1280.jpg" data-markdown="slides/index.md"></section>
<section data-separator="^\n\n\n"
data-vertical="^\n\n"
data-background="http://farm5.staticflickr.com/4122/4735516686_62ae6eb0f8_b.jpg" data-markdown="slides/part-2-git-intro.md"></section>
<section data-separator="^\n\n\n"
data-vertical="^\n\n"
data-background="http://farm7.staticflickr.com/6128/5932561907_c325e9b981_b.jpg" data-markdown="slides/part-3-installation.md"></section>
<section data-separator="^\n\n\n"
data-vertical="^\n\n"
data-background="img/dark.jpg" data-markdown="slides/part-4-first-repo.md"></section>
<section data-separator="^\n\n\n"
data-vertical="^\n\n"
data-background="img/dark.jpg" data-markdown="slides/part-5-branches.md"></section>
<section data-separator="^\n\n\n"
data-vertical="^\n\n"
data-background="img/dark.jpg" data-markdown="slides/part-6-remote.md"></section>
<section data-separator="^\n\n\n"
data-vertical="^\n\n"
data-background="img/dark.jpg" data-markdown="slides/part-7-github-pages.md"></section>
<section data-separator="^\n\n\n"
data-vertical="^\n\n"
data-background="http://24.media.tumblr.com/da6bdeb8f4e2e4104b539e5ad755c1cf/tumblr_muuhikhivh1st5lhmo1_1280.jpg" data-markdown="slides/part-8-thanks.md"></section>
</div>
</div>
<script src="bower_components/reveal.js/lib/js/head.min.js"></script>
<script src="bower_components/reveal.js/js/reveal.min.js"></script>
<script>
// Configure Reveal
// Full list of configuration options available here:
// https://github.com/hakimel/reveal.js#configuration
Reveal.initialize({
controls: true,
progress: true,
history: true,
center: true,
fragments: true,
theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
transition: Reveal.getQueryHash().transition || 'default', // default/cube/page/concave/zoom/linear/fade/none
// Optional libraries used to extend on reveal.js
dependencies: [
{ src: 'bower_components/reveal.js/lib/js/classList.js', condition: function() { return !document.body.classList; } },
{ src: 'bower_components/reveal.js/plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
{ src: 'bower_components/reveal.js/plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
{ src: 'bower_components/reveal.js/plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
{ src: 'bower_components/reveal.js/plugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } },
{ src: 'bower_components/reveal.js/plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } },
// { src: 'plugin/search/search.js', async: true, condition: function() { return !!document.body.classList; } }
//{ src: 'bower_components/reveal.js/plugin/remotes/remotes.js', async: true, condition: function() { return !!document.body.classList; } }
{ src: 'js/loadhtmlslides.js', condition: function() { return !!document.querySelector( '[data-html]' ); } }
]
});
</script>
</body>
</html>
js/loadhtmlslides.js 0 → 100644
+ 41
− 0
View file @ 71588fbc
// Modified from markdown.js from Hakim to handle external html files
(function () {
/*jslint loopfunc: true, browser: true*/
/*globals alert*/
'use strict';
var querySlidingHtml = function () {
var sections = document.querySelectorAll('[data-html]'),
section, j, jlen;
for (j = 0, jlen = sections.length; j < jlen; j++) {
section = sections[j];
if (section.getAttribute('data-html').length) {
var xhr = new XMLHttpRequest(),
url = section.getAttribute('data-html'),
cb = function () {
if (xhr.readyState === 4) {
if (xhr.status >= 200 && xhr.status < 300) {
section.innerHTML = xhr.responseText;
} else {
section.outerHTML = '<section data-state="alert">ERROR: The attempt to fetch ' + url + ' failed with the HTTP status ' + xhr.status + '. Check your browser\'s JavaScript console for more details.</p></section>';
}
}
};
xhr.onreadystatechange = cb;
xhr.open('GET', url, false);
try {
xhr.send();
} catch (e) {
alert('Failed to get file' + url + '.' + e);
}
}
}
};
querySlidingHtml();
})();
package.json 0 → 100644
+ 21
− 0
View file @ 71588fbc
{
"name": "git-intro",
"version": "0.0.1",
"private": true,
"devDependencies": {
"grunt": "~0.4.1",
"grunt-contrib-connect": "~0.5.0",
"grunt-contrib-watch": "~0.5.3",
"grunt-contrib-copy": "~0.4.1",
"grunt-contrib-jshint": "~0.7.0",
"load-grunt-tasks": "~0.2.0",
"grunt-coffeelint": "0.0.7",
"grunt-gh-pages": "~0.9.0"
},
"engines": {
"node": ">=0.8.0"
},
"scripts": {
"test": "grunt test"
}
}
slides/index.md 0 → 100644
+ 4
− 0
View file @ 71588fbc
<img src="img/lewagon.png" class="as-is" height="50" />
# Starting with Git
##(and Github)
slides/list.json 0 → 100644
+ 50
− 0
View file @ 71588fbc
[
{
"filename": "index.md",
"attr": {
"data-background": "http://25.media.tumblr.com/b03e53931e2264f97a3e93beae6d3053/tumblr_mtw7hple1a1st5lhmo1_1280.jpg"
}
},
{
"filename": "part-2-git-intro.md",
"attr": {
"data-background": "http://farm5.staticflickr.com/4122/4735516686_62ae6eb0f8_b.jpg"
}
},
{
"filename": "part-3-installation.md",
"attr": {
"data-background": "http://farm7.staticflickr.com/6128/5932561907_c325e9b981_b.jpg"
}
},
{
"filename": "part-4-first-repo.md",
"attr": {
"data-background": "img/dark.jpg"
}
},
{
"filename": "part-5-branches.md",
"attr": {
"data-background": "img/dark.jpg"
}
},
{
"filename": "part-6-remote.md",
"attr": {
"data-background": "img/dark.jpg"
}
},
{
"filename": "part-7-github-pages.md",
"attr": {
"data-background": "img/dark.jpg"
}
},
{
"filename": "part-8-thanks.md",
"attr": {
"data-background": "http://24.media.tumblr.com/da6bdeb8f4e2e4104b539e5ad755c1cf/tumblr_muuhikhivh1st5lhmo1_1280.jpg"
}
}
]
slides/part-1-about-vcs.md 0 → 100644
+ 0
− 0
View file @ 71588fbc
slides/part-2-git-intro.md 0 → 100644
+ 23
− 0
View file @ 71588fbc
<img src="img/git_logo.png" class="as-is" />
note:
Put your speaker notes here.
You can see them pressing 's'.
## Origin
![](img/linus.jpg)
Designed and implemented in 2005 by **Linus Torvalds**
![](img/git_definition.png)
note:
I'm an egotistical bastard, and I name all my projects after myself.
First Linux, now git.
## Décentralisé
## Rapide
## Performant
slides/part-3-installation.md 0 → 100644
+ 26
− 0
View file @ 71588fbc
# Installation
<img src="img/github_app.png" class="as-is" height="300" />
[mac.github.com](http://mac.github.com) ou [windows.github.com](http://windows.github.com)
note:
Les participants téléchargent le logiciel Github + installation.
## Configuration
```shell
$ git config --global user.name "Sebastien Saunier"
$ git config --global user.email "seb@saunier.me"
$ git config -l
```
## Prêt ?
```shell
$ git --version
# git version 1.8.5
```
\ No newline at end of file
slides/part-4-first-repo.md 0 → 100644
+ 146
− 0
View file @ 71588fbc
# Les bases
## Mon premier dépôt
```shell
$ git init
$ git status
$ git add
$ git diff
$ git commit
$ git log
```
note:
Voici les commandes que nous allons apprendre
## Nouveau projet : Listes
<div class="fragment">
Créer l'espace de travail
```shell
$ cd
$ mkdir workspace
$ cd workspace
```
<div class="fragment">
Puis le dossier du nouveau projet
```shell
$ mkdir listes
$ cd listes
$ git init
```
## Nouveau fichier
Créer le fichier `courses.txt`
<div class="fragment">
```shell
$ git status
```
<div class="fragment">
```shell
$ git add courses.txt
$ git status
```
<div class="fragment">
```shell
$ git commit -m "Creation de la liste de courses"
$ git status
```
note:
Pas besoin de serveur, pas besoin de connexion Internet
## Modification de fichier
Modifier le fichier `courses.txt`
<div class="fragment">
```shell
$ git status
```
<div class="fragment">
```shell
$ git diff courses.txt
```
<div class="fragment">
```shell
$ git add courses.txt
$ git status
```
<div class="fragment">
```shell
$ git commit -m "Ajout du beurre"
$ git status
```
<div class="fragment">
```shell
$ git log
```
## Que s'est-il passé ?
## Espace de travail
_working directory_
```shell
$ git status
# Changes not staged for commit:
```
## Zone de transit
_index_ ou _staging area_
```shell
$ git status
# Changes to be commited:
```
<img src="img/git-0-start.png" class="as-is" />
<img src="img/git-1-dirty.png" class="as-is" />
<img src="img/git-2-add.png" class="as-is" />
<img src="img/git-3-commit.png" class="as-is" />
## Et dans l'autre sens ?
<img src="img/git-1-dirty.png" class="as-is" />
<img src="img/git-4-checkout.png" class="as-is" />
<img src="img/git-2-add.png" class="as-is" />
<img src="img/git-5-reset.png" class="as-is" />
## Rinse and Repeat
\ No newline at end of file
slides/part-5-branches.md 0 → 100644
+ 55
− 0
View file @ 71588fbc
# Branches
Expérimentez en toute sécurité
<img src="img/branch-0-master.png" class="as-is" />
## Une branche = Une fonctionnalité
```shell
$ git checkout -b noel
```
<img src="img/branch-1-checkout-b.png" class="as-is" />
## Navigation
Lister les branches
```shell
$ git branch
```
Se positionner dans une branche
```shell
$ git checkout <branch_name>
```
```shell
$ git commit
```
<img src="img/branch-2-commit.png" class="as-is" />
## Fusion
### En anglais, _merge_
```shell
$ git checkout master
$ git diff master..noel
$ git merge noel
```
<img src="img/branch-3-merge.png" class="as-is" />
## Nettoyage
```shell
$ git branch -d noel
```
<img src="img/branch-4-br-d.png" class="as-is" />
slides/part-6-remote.md 0 → 100644
+ 53
− 0
View file @ 71588fbc
# Remote
Parlons de dépôt *distant*
<img src="img/remote-0-master.png" class="as-is" />
<img src="img/remote-1-remote.png" class="as-is" />
## Héberger un dépôt distant ?
Github (Ou [BitBucket](https://bitbucket.org/))
## Ajouter une _remote_
```shell
$ git remote add origin git@github.com:<user>/<proj>.git
$ git remote -v
```
```shell
$ git push origin master
```
<img src="img/remote-2-push.png" class="as-is" />
## Récupérer les changements
```shell
$ git checkout master # Aller sur la branche master
$ git status # Est-ce propre? (Bien sûr!)
$ git pull origin master # Récupérer le travail
# de l'équipe
```
## _Sync Branch_
Terminologie de l'application GitHub
## Conflits
## Pull Requests
Ou comment utiliser GitHub pour vos revues de code
## Fork
Contribuez à l'open source
\ No newline at end of file
slides/part-7-github-pages.md 0 → 100644
+ 35
− 0
View file @ 71588fbc
# GitHub Pages
Ou comment héberger **gratuitement** votre portfolio
Même s'il génère 1M de pages vues!
## Dépôt magique
`<user>.github.io`
`master => http://<user>.github.io/`
## Branche magique
Tous les autres dépôt GitHub:
`gh-pages => http://<user>.github.io/<repository>/`
## Action!
Un simple fichier `index.html` suffit :)
## Marque blanche
`http://<user>.github.io => http://your.domain`
Utilisez un fichier `CNAME` à la racine du dépôt.
[Détails](https://help.github.com/articles/setting-up-a-custom-domain-with-pages)
Exemple: [ssaunier.github.io/CNAME](https://github.com/ssaunier/ssaunier.github.io/blob/master/CNAME)
\ No newline at end of file
slides/part-8-thanks.md 0 → 100644
+ 10
− 0
View file @ 71588fbc
# Merci!
### Laurent Heirendt
![](https://avatars0.githubusercontent.com/u/20812112?v=3&s=180)
### Sylvain Arreckx
![](https://avatars1.githubusercontent.com/u/816318?v=3&s=180)
Cheat sheet : [Web](http://rogerdudler.github.io/git-guide/index.html) or [PDF](http://rogerdudler.github.io/git-guide/files/git_cheat_sheet.pdf) prepared by [@rogerdudler](https://github.com/rogerdudler)
templates/_index.html 0 → 100644
+ 91
− 0
View file @ 71588fbc
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Débuter avec Git et Github</title>
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<link rel="stylesheet" href="bower_components/reveal.js/css/reveal.min.css">
<link rel="stylesheet" href="bower_components/reveal.js/css/theme/night.css" id="theme">
<link rel="stylesheet" href="css/style.css">
<!-- For syntax highlighting -->
<link rel="stylesheet" href="bower_components/reveal.js/lib/css/zenburn.css" id="highlight-theme">
<!-- If the query includes 'print-pdf', use the PDF print sheet -->
<script>
document.write( '<link rel="stylesheet" href="bower_components/reveal.js/css/print/' + ( window.location.search.match( /print-pdf/gi ) ? 'pdf' : 'paper' ) + '.css" type="text/css" media="print">' );
</script>
<!--[if lt IE 9]>
<script src="lib/js/html5shiv.js"></script>
<![endif]-->
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
</head>
<body>
<div class="reveal">
<div class="slides">
<% _.forEach(slides, function(slide) { %>
<% if (!_.isArray(slide)) { %>
<%= section(slide) %>
<% } %>
<% if (_.isArray(slide)) { %>
<section>
<% _.forEach(slide, function(verticalslide) { %>
<%= section(verticalslide) %>
<% }); %>
</section>
<% } %>
<% }); %>
</div>
</div>
<script src="bower_components/reveal.js/lib/js/head.min.js"></script>
<script src="bower_components/reveal.js/js/reveal.min.js"></script>
<script>
// Configure Reveal
// Full list of configuration options available here:
// https://github.com/hakimel/reveal.js#configuration
Reveal.initialize({
controls: true,
progress: true,
history: true,
center: true,
fragments: true,
theme: Reveal.getQueryHash().theme, // available themes are in /css/theme
transition: Reveal.getQueryHash().transition || 'default', // default/cube/page/concave/zoom/linear/fade/none
// Optional libraries used to extend on reveal.js
dependencies: [
{ src: 'bower_components/reveal.js/lib/js/classList.js', condition: function() { return !document.body.classList; } },
{ src: 'bower_components/reveal.js/plugin/markdown/marked.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
{ src: 'bower_components/reveal.js/plugin/markdown/markdown.js', condition: function() { return !!document.querySelector( '[data-markdown]' ); } },
{ src: 'bower_components/reveal.js/plugin/highlight/highlight.js', async: true, callback: function() { hljs.initHighlightingOnLoad(); } },
{ src: 'bower_components/reveal.js/plugin/zoom-js/zoom.js', async: true, condition: function() { return !!document.body.classList; } },
{ src: 'bower_components/reveal.js/plugin/notes/notes.js', async: true, condition: function() { return !!document.body.classList; } },
// { src: 'plugin/search/search.js', async: true, condition: function() { return !!document.body.classList; } }
//{ src: 'bower_components/reveal.js/plugin/remotes/remotes.js', async: true, condition: function() { return !!document.body.classList; } }
{ src: 'js/loadhtmlslides.js', condition: function() { return !!document.querySelector( '[data-html]' ); } }
]
});
</script>
</body>
</html>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment