Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
9c631eb
Git spelling fix and GitHub capitalization fix
Dec 30, 2013
cfe635c
Merge pull request #2 from matthewmccullough/patch-1
Cara-Jo Jul 14, 2014
6a5d92c
Update to git modules
Cara-Jo Sep 30, 2014
5e880ab
Updates to gh-pages
Cara-Jo Sep 30, 2014
f03e286
Fixed logo typo
Roenok Feb 13, 2015
579fbe8
Merge pull request #6 from girldevelopit/master
Roenok Feb 13, 2015
a572bfa
Merge pull request #1 from girldevelopit/master
Roenok Feb 13, 2015
99177e1
Added gitignore
Roenok Feb 13, 2015
c425a46
Removed submodule
Roenok Feb 13, 2015
49c54ca
Removed submodule from config
Roenok Feb 13, 2015
ffc1ef7
Delete .gitmodules
Roenok Feb 13, 2015
09c55d6
Replacing reveal
Roenok Feb 13, 2015
a524952
Merge pull request #8 from girldevelopit/gh-pages
Roenok Feb 13, 2015
0e28e08
Merge pull request #9 from Roenok/master
Roenok Mar 19, 2015
fdacc2d
Update charts & link, remove whitespace
cherimarie Jul 14, 2015
16ba22a
update install slide: latest version
marlabrizel Apr 4, 2016
a67b674
Merge pull request #11 from marlabrizel/master
Roenok Apr 5, 2016
7bc9ac3
Merge pull request #10 from cherimarie/update_charts
Roenok Apr 5, 2016
7fea607
Update to new slide template, fix 404s
raearnold Apr 9, 2017
1e5eef0
Update README with description, class link
raearnold Apr 9, 2017
6a5a217
Revise slides up to Branching with selected RDU updates
raearnold Apr 21, 2017
389a2df
Update branching, merging, general cleanup up to slide 38
raearnold Apr 24, 2017
707df7f
Cleanup files, finish revisions for GitHub section
raearnold Apr 24, 2017
4988214
Merge pull request #15 from GDIBTV/master
Roenok Apr 25, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
*.db
.DS_Store
.svn
log/*.log
tmp/**
node_modules/
.sass-cache
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

137 changes: 137 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
/* global module:false */
module.exports = function(grunt) {
var port = grunt.option('port') || 8000;
// Project configuration
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
meta: {
banner:
'/*!\n' +
' * reveal.js <%= pkg.version %> (<%= grunt.template.today("yyyy-mm-dd, HH:MM") %>)\n' +
' * http://lab.hakim.se/reveal-js\n' +
' * MIT licensed\n' +
' *\n' +
' * Copyright (C) 2014 Hakim El Hattab, http://hakim.se\n' +
' */'
},

qunit: {
files: [ 'test/*.html' ]
},

uglify: {
options: {
banner: '<%= meta.banner %>\n'
},
build: {
src: 'js/reveal.js',
dest: 'js/reveal.min.js'
}
},

cssmin: {
compress: {
files: {
'css/reveal.min.css': [ 'css/reveal.css' ]
}
}
},

sass: {
main: {
files: {
'css/theme/default.css': 'css/theme/source/default.scss',
'css/theme/beige.css': 'css/theme/source/beige.scss',
'css/theme/night.css': 'css/theme/source/night.scss',
'css/theme/serif.css': 'css/theme/source/serif.scss',
'css/theme/simple.css': 'css/theme/source/simple.scss',
'css/theme/sky.css': 'css/theme/source/sky.scss',
'css/theme/moon.css': 'css/theme/source/moon.scss',
'css/theme/solarized.css': 'css/theme/source/solarized.scss',
'css/theme/blood.css': 'css/theme/source/blood.scss'
}
}
},

jshint: {
options: {
curly: false,
eqeqeq: true,
immed: true,
latedef: true,
newcap: true,
noarg: true,
sub: true,
undef: true,
eqnull: true,
browser: true,
expr: true,
globals: {
head: false,
module: false,
console: false,
unescape: false
}
},
files: [ 'Gruntfile.js', 'js/reveal.js' ]
},

connect: {
server: {
options: {
port: port,
base: '.'
}
}
},

zip: {
'reveal-js-presentation.zip': [
'index.html',
'css/**',
'js/**',
'lib/**',
'images/**',
'plugin/**'
]
},

watch: {
main: {
files: [ 'Gruntfile.js', 'js/reveal.js', 'css/reveal.css' ],
tasks: 'default'
},
theme: {
files: [ 'css/theme/source/*.scss', 'css/theme/template/*.scss' ],
tasks: 'themes'
}
}

});

// Dependencies
grunt.loadNpmTasks( 'grunt-contrib-qunit' );
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-contrib-cssmin' );
grunt.loadNpmTasks( 'grunt-contrib-uglify' );
grunt.loadNpmTasks( 'grunt-contrib-watch' );
grunt.loadNpmTasks( 'grunt-contrib-sass' );
grunt.loadNpmTasks( 'grunt-contrib-connect' );
grunt.loadNpmTasks( 'grunt-zip' );

// Default task
grunt.registerTask( 'default', [ 'jshint', 'cssmin', 'uglify', 'qunit' ] );

// Theme task
grunt.registerTask( 'themes', [ 'sass' ] );

// Package presentation to archive
grunt.registerTask( 'package', [ 'default', 'zip' ] );

// Serve presentation locally
grunt.registerTask( 'serve', [ 'connect', 'watch' ] );

// Run tests
grunt.registerTask( 'test', [ 'jshint', 'qunit' ] );

};
19 changes: 19 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
Copyright (C) 2014 Hakim El Hattab, http://hakim.se

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
85 changes: 65 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,71 @@
# CORE INTRO TO GIT AND GITHUB
# Intro to Git and GitHub (Featured)

Slides and materials are hosted at [http://girldevelopit.github.io/gdi-featured-git-github/#/](http://girldevelopit.github.io/gdi-featured-git-github/#/)

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

This is the official Girl Develop It Core Intro to Git and Github course. Material based on original material by Kim Moir, Daniel Fischer, Aurelia Moser, Carina C. Zona and Izzy Johnston.

The course is meant to be taught in a two-hour workshop. Each of the slides and practice files are customizable according to the needs of a given class or audience.


## Theme customization

You can change theme colors by changing the theme css to any of the following options:
```html
<link rel="stylesheet" href="css/theme/gdidefault.css" id="theme">
<link rel="stylesheet" href="css/theme/gdilight.css" id="theme">
<link rel="stylesheet" href="css/theme/gdisunny.css" id="theme">
<link rel="stylesheet" href="css/theme/gdicool.css" id="theme">
```
You can change the text editor theme by changing the highlight.js css to the following options:
```html
<link rel="stylesheet" href="lib/css/dark.css">
<link rel="stylesheet" href="lib/css/light.css">
```
You can change transition by changing the reveal transition property in Reveal.initialize
```javascript
Reveal.initialize({
transition: 'default', // default/cube/page/concave/zoom/linear/none
});
```
These slides use the GDI Reveal template. For more information on modifying the theme and to learn the capabilities of Reveal, check out the [GDI Slides Template Wiki](https://github.com/girldevelopit/gdi-slides-template/wiki)


## Course Description

Ever make changes that broke your code and forgot how it was working before? Want to work together with someone on a code project, but aren't sure who has the latest version of a particular file? Version control can solve these and other problems!

Git is a popular version control application that can track your code changes, as well as help you to be more methodical in your programming. Win-win! This session will introduce the basics of version control, how to use git to keep track of your changes to a project, and using GitHub (a hosting service) to collaborate with other developers.

### We will cover:

• the basic concepts of version control

• the differences between Git and other version control applications

• fundamental Git commands to track changes to a small project

• the basics of collaborating on code with other developers

• how to use GitHub

Teacher's assistants will be on hand to assist you with questions and overcome roadblocks.

Want to try Git for yourself? Github has a 15-minute tutorial you can go through on your own at [TryGit](https://try.github.io/levels/1/challenges/1).


### Prerequisites:

**1. A willingness to use the command line.**

We will be changing directories, listing directory contents, and using git from the command line throughout the class.

**2. A laptop with Git already installed. (Don't forget a charger, too!)**

For Mac users, [http://git-scm.com/download/mac](http://git-scm.com/download/mac)
For Windows users, [https://git-for-windows.github.io/](https://git-for-windows.github.io/)

**3. A Github account. **

Sign up for free at [https://github.com/join](https://github.com/join).

This class will not use code when committing to a GitHub repository (we'll stick with text!), so no need to worry about knowing a particular programming language.


### Meet Your Teacher:

Fill in teacher bio here

### Thank you to our hosts!

Fill in info about location here


---------------------------
**We're here to help! If you have additional questions or would like to talk further before signing up for a class, please post your question here or contact the leadership team at [an email address].**

Our curriculum is tailored toward adult learners, so we cannot accommodate students under 18 years old.

We want you to have the best experience possible. Do you have any accessibility concerns the event organizer should know about? Please let us know via email or Meetup message.
Binary file added css/images/pink-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added css/images/white-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading