73 lines
2.6 KiB
Org Mode
73 lines
2.6 KiB
Org Mode
|
|
#+TITLE: Git Deep Dive
|
|
|
|
#+SUBTITLE: [[file:{{{input-file}}}?print-pdf][Printable version]]
|
|
|
|
#+DATE: <2018-06-25 Mon>
|
|
#+AUTHOR: Éibhear Ó hAnluain
|
|
#+EMAIL: eibhear.geo@gmail.com
|
|
|
|
#+OPTIONS: ':nil *:t -:t ::t <:t \n:nil ^:{} author:t c:nil creator:nil
|
|
#+OPTIONS: d:nil date:t e:t email:t f:t inline:t num:nil p:nil pri:nil
|
|
#+OPTIONS: stat:nil tags:nil tasks:t tex:t timestamp:nil toc:t todo:nil |:t
|
|
#+DESCRIPTION: <The presentation description>
|
|
#+LANGUAGE: en
|
|
|
|
# <Where the reveal.js project (https://github.com/hakimel/reveal.js.git) is cloned/copied to>
|
|
#+REVEAL_ROOT: ../reveal.js
|
|
|
|
# Possible transitions: default (like a sphere!), cube, page, concave, zoom, linear, fade, none
|
|
#+REVEAL_INIT_OPTIONS: transition:'concave', margin: 0.1, slideNumber:true
|
|
|
|
# Possible themes: beige, black, blood, league, moon, night, serif, simple, sky, solarized, white
|
|
#+REVEAL_THEME: white
|
|
|
|
#+REVEAL_HLEVEL: 1
|
|
|
|
# <Copy this file to where the generated HTML will be>
|
|
#+REVEAL_EXTRA_CSS: ./e-reveal.css
|
|
#+REVEAL_EXTRA_CSS: ./gridding.css
|
|
|
|
# <Copy this file to where the generated HTML will be>
|
|
#+REVEAL_DEFAULT_SLIDE_BACKGROUND: ./bCardBackground.png
|
|
#+REVEAL_TITLE_SLIDE_BACKGROUND: ./bCardBackground.png
|
|
#+REVEAL_TOC_SLIDE_BACKGROUND: ./bCardBackground.png
|
|
|
|
#+REVEAL_DEFAULT_SLIDE_SIZE: 100%
|
|
#+REVEAL_TITLE_SLIDE_SIZE: 100%
|
|
#+REVEAL_TOC_SLIDE_SIZE: 100%
|
|
|
|
* Introduction
|
|
** Introduction
|
|
Assumes basic knowledge: =clone=, =add=, =commit=, =merge=, =pull=,
|
|
=push=
|
|
|
|
Assumes comfort with the command line: =git= on Linux; =git bash=,
|
|
=git cmd= on Windows
|
|
|
|
- Paddling :: config, fetch-and-merge, merge approaches
|
|
- Snorkling and Scuba diving :: refs, =HEAD=, annotated tags,
|
|
submodules, =blame=, signing and verifying commits
|
|
- Submarining :: the structure of a commit, "Content Addressable Filesystem", git objects
|
|
- Unmanned submersibles :: the reflog, =fsck= and =gc=, finding and
|
|
dealing with specific git objects
|
|
|
|
** About Éibhear Ó hAnluain
|
|
- Solutions Architect
|
|
+ eibhear.geo@gmail.com
|
|
- Software engineer since 1994
|
|
- Using revision control since 1994: subversion, git, IBM/Rational/Atria ClearCase, RCS, VSS, CVS, Serena SCM, Serena PVCS, SCCS
|
|
- Introduced revision control in multiple environments
|
|
- Multiple revision-control migrations
|
|
+ RCS -> subversion
|
|
+ VSS -> subversion
|
|
+ CVS -> git
|
|
* The Coast
|
|
#+CAPTION: [[https://commons.wikimedia.org/wiki/File:Grotta_azzurra.jpg][Frédéric de Goldschmidt www.frederic.net]], [[https://creativecommons.org/licenses/by/3.0][CC BY 3.0]], via Wikimedia Commons
|
|
file:images/Grotta_azzurra.jpg
|
|
|
|
* The Shallows
|
|
|
|
* The Continental shelf
|
|
|
|
* The Deep trenches
|