This repository has been archived by the owner on Apr 14, 2024. It is now read-only.
forked from alexfish/git-tips
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathindex.html
271 lines (243 loc) · 12.2 KB
/
index.html
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
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
<!DOCTYPE html>
<html>
<head>
<title>git tips</title>
<meta charset='utf-8'>
<meta content='width=1024, user-scalable=no' name='viewport'>
<!-- deck.js's core css -->
<link href="deck.js/core/deck.core.css" rel="stylesheet" type="text/css"/>
<!-- deck.js extension CSS files -->
<link href="deck.js/extensions/codemirror/deck.codemirror.css" rel="stylesheet" type="text/css"/>
<link href="deck.js/extensions/goto/deck.goto.css" rel="stylesheet" type="text/css"/>
<link href="deck.js/extensions/hash/deck.hash.css" rel="stylesheet" type="text/css"/>
<link href="deck.js/extensions/menu/deck.menu.css" rel="stylesheet" type="text/css"/>
<link href="deck.js/extensions/navigation/deck.navigation.css" rel="stylesheet" type="text/css"/>
<link href="deck.js/extensions/scale/deck.scale.css" rel="stylesheet" type="text/css"/>
<link href="deck.js/extensions/status/deck.status.css" rel="stylesheet" type="text/css"/>
<!-- all css in the css dir: Keydown CSS, your custom CSS, and themes from deck.js -->
<link href="css/keydown.css" rel="stylesheet" type="text/css"/>
<link href="css/default.css" rel="stylesheet" type="text/css"/>
<link href="css/horizontal-slide.css" rel="stylesheet" type="text/css"/>
<link href="css/presentation.css" rel="stylesheet" type="text/css"/>
<link href="css/swiss.css" rel="stylesheet" type="text/css"/>
<!-- Modernizr (provided for legacy browsers) -->
<script src="deck.js/support/modernizr.custom.js" type="text/javascript"></script>
</head>
<body class='deck-container keydown'>
<section class='slide'>
<div class='spacer top'></div>
<div class='content'>
<p><img src="https://raw.githubusercontent.com/alexfish/git-tips/master/images/logo.png" alt="logo" /></p>
<h1>git tips</h1>
</div>
<div class='spacer bottom'></div>
</section>
<section class='slide'>
<div class='spacer top'></div>
<div class='content'>
<h2>Branched from the wrong branch?</h2>
<p><textarea class='code' display='none' mode=' '>git rebase —onto foo bar</textarea>
</p>
<p><img src="https://raw.githubusercontent.com/alexfish/git-tips/master/images/onto.gif" alt="onto" /></p>
</div>
<div class='spacer bottom'></div>
</section>
<section class='slide'>
<div class='spacer top'></div>
<div class='content'>
<h2>Forgot to add something to a commit?</h2>
<p><textarea class='code' display='none' mode=' '>git commit —amend -c foobar</textarea>
</p>
<p><img src="https://raw.githubusercontent.com/alexfish/git-tips/master/images/ammend.gif" alt="ammend" /></p>
</div>
<div class='spacer bottom'></div>
</section>
<section class='slide'>
<div class='spacer top'></div>
<div class='content'>
<h2>Want to switch back to the previous branch?</h2>
<p><textarea class='code' display='none' mode=' '>git checkout -</textarea>
</p>
<p><img src="https://raw.githubusercontent.com/alexfish/git-tips/master/images/checkout.gif" alt="checkout" /></p>
</div>
<div class='spacer bottom'></div>
</section>
<section class='slide'>
<div class='spacer top'></div>
<div class='content'>
<h2>Want to stage some changes?</h2>
<p><textarea class='code' display='none' mode=' '>git add -p</textarea>
</p>
<p><img src="https://raw.githubusercontent.com/alexfish/git-tips/master/images/add.gif" alt="add" /></p>
</div>
<div class='spacer bottom'></div>
</section>
<section class='slide'>
<div class='spacer top'></div>
<div class='content'>
<h2>Want to set upstream?</h2>
<p><textarea class='code' display='none' mode=' '>git push -u origin foobar</textarea>
</p>
<p><img src="https://raw.githubusercontent.com/alexfish/git-tips/master/images/push.gif" alt="push" /></p>
</div>
<div class='spacer bottom'></div>
</section>
<section class='slide'>
<div class='spacer top'></div>
<div class='content'>
<h2>Want to push nothing?</h2>
<p><textarea class='code' display='none' mode=' '>git commit —allow-empty -m "foobar"</textarea>
</p>
<p><img src="https://raw.githubusercontent.com/alexfish/git-tips/master/images/empty.gif" alt="empty" /></p>
</div>
<div class='spacer bottom'></div>
</section>
<section class='slide'>
<div class='spacer top'></div>
<div class='content'>
<h2>Want to find out which branch has a commit?</h2>
<p><textarea class='code' display='none' mode=' '>git branch --contains foobar</textarea>
</p>
<p><img src="https://raw.githubusercontent.com/alexfish/git-tips/master/images/contains.gif" alt="contains" /></p>
</div>
<div class='spacer bottom'></div>
</section>
<section class='slide'>
<div class='spacer top'></div>
<div class='content'>
<h2>Want to speed things up?</h2>
<p><textarea class='code' display='none' mode=' '>git gc</textarea>
</p>
<p><img src="https://raw.githubusercontent.com/alexfish/git-tips/master/images/gc.gif" alt="gc" /></p>
</div>
<div class='spacer bottom'></div>
</section>
<section class='slide'>
<div class='spacer top'></div>
<div class='content'>
<h2>Want to undo bad things?</h2>
<p><textarea class='code' display='none' mode=' '>git reflog</textarea>
</p>
<p><img src="https://raw.githubusercontent.com/alexfish/git-tips/master/images/reflog.gif" alt="reflog" /></p>
</div>
<div class='spacer bottom'></div>
</section>
<section class='slide'>
<div class='spacer top'></div>
<div class='content'>
<h2>Want to find out when things broke?</h2>
<p><textarea class='code' display='none' mode=' '>git bisect start foo bar</textarea>
</p>
<p><img src="https://raw.githubusercontent.com/alexfish/git-tips/master/images/bisect.gif" alt="bisect" /></p>
</div>
<div class='spacer bottom'></div>
</section>
<section class='slide'>
<div class='spacer top'></div>
<div class='content'>
<h2>Want to squash/delete commits?</h2>
<p><textarea class='code' display='none' mode=' '>git rebase -i foobar</textarea>
</p>
<p><img src="https://raw.githubusercontent.com/alexfish/git-tips/master/images/rebase.gif" alt="rebase" /></p>
</div>
<div class='spacer bottom'></div>
</section>
<section class='slide'>
<div class='spacer top'></div>
<div class='content'>
<h2>Want to always pull with rebase?</h2>
<p><textarea class='code' display='none' mode=' '>git config --global branch.autosetuprebase always</textarea>
</p>
</div>
<div class='spacer bottom'></div>
</section>
<section class='slide'>
<div class='spacer top'></div>
<div class='content'>
<h2>Want git to be case sensative?</h2>
<p><textarea class='code' display='none' mode=' '>git config --global core.ignorecase false</textarea>
</p>
</div>
<div class='spacer bottom'></div>
</section>
<section class='slide'>
<div class='spacer top'></div>
<div class='content'>
<h2>Love typos?</h2>
<p><textarea class='code' display='none' mode=' '>git config --global help.autocorrect 1</textarea>
</p>
</div>
<div class='spacer bottom'></div>
</section>
<section class='slide'>
<div class='spacer top'></div>
<div class='content'>
<h2>Like color?</h2>
<p><textarea class='code' display='none' mode=' '>git config —global color.ui 1</textarea>
</p>
</div>
<div class='spacer bottom'></div>
</section>
<section class='slide'>
<div class='spacer top'></div>
<div class='content'>
<h2>Same conflicts?</h2>
<p><textarea class='code' display='none' mode=' '>git config --global rerere.enabled true</textarea>
</p>
</div>
<div class='spacer bottom'></div>
</section>
<!-- deck.js navigation extension -->
<a class='deck-prev-link' href='#' title='Previous'>←</a>
<a class='deck-next-link' href='#' title='Next'>→</a>
<!-- deck.js hash extension -->
<a class='deck-permalink' href='.' title='Permalink to this slide'>#</a>
<!-- deck.js status extension -->
<p class='deck-status'>
<span class='deck-status-current'></span>
/
<span class='deck-status-total'></span>
</p>
<!-- jQuery & deck.js -->
<script src="deck.js/support/jquery.1.6.4.min.js" type="text/javascript"></script>
<script src="deck.js/core/deck.core.js" type="text/javascript"></script>
<!-- deck.js extension JS files -->
<script src="deck.js/extensions/codemirror/codemirror.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/deck.codemirror.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/mode/clike/clike.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/mode/clojure/clojure.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/mode/coffeescript/coffeescript.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/mode/css/css.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/mode/diff/diff.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/mode/haskell/haskell.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/mode/htmlmixed/htmlmixed.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/mode/javascript/javascript.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/mode/lua/lua.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/mode/php/php.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/mode/plsql/plsql.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/mode/python/python.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/mode/r/r.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/mode/rst/rst.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/mode/ruby/ruby.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/mode/scheme/scheme.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/mode/smalltalk/smalltalk.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/mode/sparql/sparql.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/mode/stex/stex.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/mode/velocity/velocity.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/mode/xml/xml.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/mode/xmlpure/xmlpure.js" type="text/javascript"></script>
<script src="deck.js/extensions/codemirror/mode/yaml/yaml.js" type="text/javascript"></script>
<script src="deck.js/extensions/goto/deck.goto.js" type="text/javascript"></script>
<script src="deck.js/extensions/hash/deck.hash.js" type="text/javascript"></script>
<script src="deck.js/extensions/menu/deck.menu.js" type="text/javascript"></script>
<script src="deck.js/extensions/navigation/deck.navigation.js" type="text/javascript"></script>
<script src="deck.js/extensions/scale/deck.scale.js" type="text/javascript"></script>
<script src="deck.js/extensions/status/deck.status.js" type="text/javascript"></script>
<!-- your custom JS here, including call to initialize deck.js-codemirror -->
<script src="js/presentation.js" type="text/javascript"></script>
<!-- Initialize the deck. -->
<script type='text/javascript'>
$(function() { $.deck('.slide'); });
</script>
</body>
</html>