acdm-spring-2017.github.io/git.html at master · reedkat/acdm-spring-2017.github.io · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
<!DOCTYPE html>
<html>
  <head>
    <title>Git and Github</title>
    <meta charset="utf-8">
    <style>
      @import url(https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz);
      @import url(https://fonts.googleapis.com/css?family=Droid+Serif:400,700,400italic);
      @import url(https://fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic);

      th {color: white; background-color: black; padding-top: 7px; padding-bottom: 7px;}
      td {padding: 3px; }
      table { width: 100%; border-collapse: collapse;}
      td, th {border: 1px solid black; font-size: 95%; text-align: center;
      }
      body { font-family: 'Times New Roman', 'times', 'serif'; }
      h1, h2, h3, h4 {
        font-family: 'Times New Roman', 'times', 'serif';
        font-weight: normal;
        margin-top: 5px;
        margin-bottom: 5px;

      }
      h4 { font-size: 115%;}
      .remark-code, .remark-inline-code { font-family: 'Ubuntu Mono';}
      p {
        margin-top: 1px;
        margin-bottom: 1px;
      }
      #raptor { width: 50%;}
      #xkcd { width: 40%;}
    </style>
  </head>
  <body>
    <textarea id="source">

class: middle

# Git and Github

Matthew J. Lavin

Clinical Assistant Professor of English and Director of Digital Media Lab

University of Pittsburgh

January 2017


---
class: middle

# Overview

- ### Why Use git?

- ### Git Basics

- ### Git vs. Github

- ### Typical Workflows

- ### Common Problems

- ### Github Pages

- ### Closing Remarks
---
class: middle

<img id="raptor" class="slide-img" src="./images/raptor.png"/>

# Why Use Git?

- ### Version control

- ### Collaboration

- ### Transparency

---
class: middle

# Git Basics

- ### Clone, Fork

- ### Add, Commit, Push, Pull/Fetch, Status

- ### readme.md, .gitignore, origin

- ### Checkout, Merge, Backtrack

---
class: middle

# Git vs. Github

- ### Git is a version control software

- ### Github is a repository management web service

- ### Git repositories can be hosted by other services

- ### Issues are part of Github only

---
class: middle

<img id="boromir" class="slide-img" src="./images/merge_master.jpg"/>

# Typical Workflows

- ### How/when to use master
- ### Fork vs. Branch
- ### Pull requests

---
class: middle

<img id="xkcd" class="slide-img" src="./images/git_delete.png"/>

# Common Problems

- ### Merge conflicts

- ### Undoing a mistake

- ### Reintroducing an error

---
class: middle

# Github Pages

- ### You can host websites on Github!
- ### Static html, css, and javscript
- ### Doesn't work for server side scripting
- ### https://pages.github.com/
- ### Will work on any repo!

---
class: middle

# Closing Remarks

- ### Get a Handle on This Now, Thank Me Later
- ### Practice Regularly
- ### Google is Your Friend
- ### Advice for Using Git and Github in Our Class

    </textarea>
    <script src="https://remarkjs.com/downloads/remark-latest.min.js">
    </script>
    <script>
      var slideshow = remark.create();
    </script>
  </body>
</html>