hackconf

debel · Sep 30, 2017 · 4759f61 · 4759f61
1 parent 43d27ed
commit 4759f61
Show file tree

Hide file tree

Showing 25 changed files with 398 additions and 166 deletions.
diff --git a/build/bundle.css b/build/bundle.css
@@ -1736,11 +1736,33 @@ based on dark.css by Ivan Sagalaev
   font-weight: bold;
 }
 
-.overflown {
-  padding-bottom: 40px !important;
+pre {
+  width: auto;
+}
+
+code {
+  font-size: 1.5em !important;
+  line-height: 1.05em !important;
+  max-height: 100% !important;
   overflow: visible !important;
 }
 
+.slides {
+  font-size: 1.5em !important;
+}
+
+.underlined {
+  text-decoration: underline;
+}
+
+.italic {
+  font-style: italic;
+}
+
+.bold {
+  font-style: bold;
+}
+
 .inline-code {
   color: salmon;
   background-color: #636363;
@@ -1749,3 +1771,34 @@ based on dark.css by Ivan Sagalaev
 .warning {
   color: salmon;
 }
+
+#title>h1 {
+  margin-bottom: 0;
+}
+
+#title>h2 {
+  margin-top: 0;
+  margin-left: 25%;
+}
+
+#title>img {
+  transform: rotate(-33deg) scale(2);
+  position: relative;
+  left: 220px;
+  top: 420px;
+  background: none;
+  border: none;
+}
+
+#meme-2>h3 {
+  margin-bottom: 0;
+}
+
+#command_types>span {
+  vertical-align: top;
+  padding-right: 50px;
+}
+
+#command_types>ul ul {
+  list-style: none;
+}
diff --git a/build/bundle.js b/build/bundle.js
@@ -5054,12 +5054,12 @@ snippets.forEach(snippet => {
 });
 
 Reveal.initialize({
-    width: 1024,
-    height: 768,
-    margin: 0.1,
-    minScale: 0.1,
-    maxScale: 1.3,
-    transition: 'fade',
+    width: 1920,
+    height: 1080,
+    margin: 0.01,
+    minScale: 0.5,
+    maxScale: 1.5,
+    transition: 'random',
     transitionSpeed: 'fast',
     controls: true,
     history: true

diff --git a/css/main.css b/css/main.css
@@ -1,8 +1,30 @@
-.overflown {
-  padding-bottom: 40px !important;
+pre {
+  width: auto;
+}
+
+code {
+  font-size: 1.5em !important;
+  line-height: 1.05em !important;
+  max-height: 100% !important;
   overflow: visible !important;
 }
 
+.slides {
+  font-size: 1.5em !important;
+}
+
+.underlined {
+  text-decoration: underline;
+}
+
+.italic {
+  font-style: italic;
+}
+
+.bold {
+  font-style: bold;
+}
+
 .inline-code {
   color: salmon;
   background-color: #636363;
@@ -11,3 +33,34 @@
 .warning {
   color: salmon;
 }
+
+#title>h1 {
+  margin-bottom: 0;
+}
+
+#title>h2 {
+  margin-top: 0;
+  margin-left: 25%;
+}
+
+#title>img {
+  transform: rotate(-33deg) scale(2);
+  position: relative;
+  left: 220px;
+  top: 420px;
+  background: none;
+  border: none;
+}
+
+#meme-2>h3 {
+  margin-bottom: 0;
+}
+
+#command_types>span {
+  vertical-align: top;
+  padding-right: 50px;
+}
+
+#command_types>ul ul {
+  list-style: none;
+}
diff --git a/extra-slides.html b/extra-slides.html
@@ -0,0 +1,141 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+  <title>Git Panic and how to avoid it: Extra slides</title>
+  <meta charset="utf-8">
+  <meta name=viewport content="width=device-width, initial-scale=1">
+  <meta name="description" content="A presentation about advanced git topics and using git the right way" />
+  <link rel="stylesheet" href="build/bundle.css" />
+</head>
+
+<body>
+  <div id="presentation" class="reveal">
+    <div class="slides">
+      <section id="title">
+        <h1>Git Panic</h1>
+        <h2>and how to avoid it</h2>
+        <h3>/ super hidden extra slides /</h3>
+      </section>
+      <section id="remote-names">
+        <h3>Attack of the clones</h3>
+        <div>If you have multiple remotes, use "clone -o"<br /> to set a more meaningful remote name than "origin"</div>
+        <pre><code class="bash">
+            # Use -o to give a meaningful name to the remote
+            git clone REMOTE_URL -o "remote_name"
+          </code></pre>
+      </section>
+      <section id="normal-vs-bare">
+        <h3>Normal vs bare init</h3>
+        <pre><code class="bash">
+            # bare repos don't have a working tree
+            # which is useful for a shared remote
+            git init vs git init --bare
+          </code></pre>
+        <img src="images/normal-vs-bare.png" />
+      </section>
+
+      <section id="checkout-m">
+        <h3>That's for another branch</h3>
+        <div>Use "-m" if you have changes to your work tree<br/>
+          that you need to move to a different branch</div>
+        <pre><code class="bash">
+          # by default checkout refuses to switch branches
+          # if your work directory is dirty
+
+          # "-m" does a three-way merge between the current branch
+          # your working tree contents, and the new branch
+          git checkout -m &lt;commitish&gt;
+        </code></pre>
+      </section>
+
+      <section id="stash">
+        <h3>The stash is like a branch</h3>
+        <div>The dog ate my stash, maaan</div>
+        <pre><code class="bash">
+          # save unfinished work as a new commit
+          git stash save -p "unfinished work"
+
+          # stash list and reflog stash are the same
+          git stash list
+          git reflog stash
+
+          # stash show and show stash are the same
+          git stash show -p
+          git show stash@{0}
+
+          # pop vs apply
+          git stash pop stash@{1}
+          git stash apply stash@{1}
+        </code></pre>
+      </section>
+
+      <section id="hooks">
+        <h3>Git hooks</h3>
+        <img width="50%" src="images/git-hooks.jpg" />
+      </section>
+      <section id="pre-commit-hook">
+        <h3>Example pre-commit hook</h3>
+        <pre><code class="bash">
+          # .git/hooks/pre-commit
+          # hook must be executable
+          #!/bin/sh
+
+          # run linter and tests
+          # if either commands exit status is non zero
+          # the commit process will be canceled
+          npm run lint
+          npm run test
+        </code></pre>
+      </section>
+      <section id="message-template-hook">
+        <h3>Example commit message template hook</h3>
+        <pre><code class="bash">
+          # .git/hooks/prepare-commit-msg
+          # hook must be executable
+          #!/bin/sh
+
+          # puts the name of the current branch
+          # in the commit message template
+          echo "[`git rev-parse --abbrev-ref HEAD`] \
+            MESSAGE HERE" > "$1"
+        </code></pre>
+      </section>
+      <section id="deployment-hook">
+        <h3>Example simple deployment hook</h3>
+        <pre><code class="bash">
+          # .git/hooks/post-receive
+          # hook must be executable
+          GIT_WORK_TREE=/app_code git checkout master -f
+          cd /app_code
+          npm install
+          npm run build
+          npm run restart
+          echo "deployed"
+        </code></pre>
+      </section>
+      <section id="the-end">
+        <h3>No more slides, go away</h3>
+        <img width="45%" src="images/dev-by-0.jpg" />
+      </section>
+    </div>
+    <script src="build/bundle.js"></script>
+    <script>
+      (function(i, s, o, g, r, a, m) {
+        i['GoogleAnalyticsObject'] = r;
+        i[r] = i[r] || function() {
+          (i[r].q = i[r].q || []).push(arguments)
+        }, i[r].l = 1 * new Date();
+        a = s.createElement(o),
+          m = s.getElementsByTagName(o)[0];
+        a.async = 1;
+        a.src = g;
+        m.parentNode.insertBefore(a, m)
+      })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
+
+      ga('create', 'UA-93032616-1', 'auto');
+      ga('send', 'pageview');
+    </script>
+</body>
+
+</html>
diff --git a/images/HC17_logo.png b/images/HC17_logo.png
diff --git a/images/add-p.png b/images/add-p.png
diff --git a/images/cherry-pick.png b/images/cherry-pick.png
diff --git a/images/detached-head.png b/images/detached-head.png
diff --git a/images/dev-by-0.jpg b/images/dev-by-0.jpg
diff --git a/images/dont-ignore-the-symptoms.gif b/images/dont-ignore-the-symptoms.gif
diff --git a/images/dontpanic.jpg b/images/dontpanic.jpg
diff --git a/images/fix-it-meeseeks.png b/images/fix-it-meeseeks.png
diff --git a/images/git-blame.png b/images/git-blame.png
diff --git a/images/git-checkout-p.png b/images/git-checkout-p.png
diff --git a/images/git-is-hard.jpg b/images/git-is-hard.jpg
diff --git a/images/git-log-nice.png b/images/git-log-nice.png
diff --git a/images/git-reflog.png b/images/git-reflog.png
diff --git a/images/git-reset-p.png b/images/git-reset-p.png
diff --git a/images/house-how-do-we-fix-this.jpg b/images/house-how-do-we-fix-this.jpg
diff --git a/images/meeseeks-box-qa.png b/images/meeseeks-box-qa.png
diff --git a/images/rebase.png b/images/rebase.png
diff --git a/images/refs.png b/images/refs.png
diff --git a/images/revert.png b/images/revert.png