forked from coordt/git-scripts
-
Notifications
You must be signed in to change notification settings - Fork 0
/
README.html
410 lines (331 loc) · 12.3 KB
/
README.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
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils 0.8.1: http://docutils.sourceforge.net/" />
<title></title>
<style type="text/css">
/*
:Author: David Goodger ([email protected])
:Id: $Id: html4css1.css 7056 2011-06-17 10:50:48Z milde $
:Copyright: This stylesheet has been placed in the public domain.
Default cascading style sheet for the HTML output of Docutils.
See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
customize this style sheet.
*/
/* used to remove borders from tables and images */
.borderless, table.borderless td, table.borderless th {
border: 0 }
table.borderless td, table.borderless th {
/* Override padding for "table.docutils td" with "! important".
The right padding separates the table cells. */
padding: 0 0.5em 0 0 ! important }
.first {
/* Override more specific margin styles with "! important". */
margin-top: 0 ! important }
.last, .with-subtitle {
margin-bottom: 0 ! important }
.hidden {
display: none }
a.toc-backref {
text-decoration: none ;
color: black }
blockquote.epigraph {
margin: 2em 5em ; }
dl.docutils dd {
margin-bottom: 0.5em }
object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
overflow: hidden;
}
/* Uncomment (and remove this text!) to get bold-faced definition list terms
dl.docutils dt {
font-weight: bold }
*/
div.abstract {
margin: 2em 5em }
div.abstract p.topic-title {
font-weight: bold ;
text-align: center }
div.admonition, div.attention, div.caution, div.danger, div.error,
div.hint, div.important, div.note, div.tip, div.warning {
margin: 2em ;
border: medium outset ;
padding: 1em }
div.admonition p.admonition-title, div.hint p.admonition-title,
div.important p.admonition-title, div.note p.admonition-title,
div.tip p.admonition-title {
font-weight: bold ;
font-family: sans-serif }
div.attention p.admonition-title, div.caution p.admonition-title,
div.danger p.admonition-title, div.error p.admonition-title,
div.warning p.admonition-title {
color: red ;
font-weight: bold ;
font-family: sans-serif }
/* Uncomment (and remove this text!) to get reduced vertical space in
compound paragraphs.
div.compound .compound-first, div.compound .compound-middle {
margin-bottom: 0.5em }
div.compound .compound-last, div.compound .compound-middle {
margin-top: 0.5em }
*/
div.dedication {
margin: 2em 5em ;
text-align: center ;
font-style: italic }
div.dedication p.topic-title {
font-weight: bold ;
font-style: normal }
div.figure {
margin-left: 2em ;
margin-right: 2em }
div.footer, div.header {
clear: both;
font-size: smaller }
div.line-block {
display: block ;
margin-top: 1em ;
margin-bottom: 1em }
div.line-block div.line-block {
margin-top: 0 ;
margin-bottom: 0 ;
margin-left: 1.5em }
div.sidebar {
margin: 0 0 0.5em 1em ;
border: medium outset ;
padding: 1em ;
background-color: #ffffee ;
width: 40% ;
float: right ;
clear: right }
div.sidebar p.rubric {
font-family: sans-serif ;
font-size: medium }
div.system-messages {
margin: 5em }
div.system-messages h1 {
color: red }
div.system-message {
border: medium outset ;
padding: 1em }
div.system-message p.system-message-title {
color: red ;
font-weight: bold }
div.topic {
margin: 2em }
h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
margin-top: 0.4em }
h1.title {
text-align: center }
h2.subtitle {
text-align: center }
hr.docutils {
width: 75% }
img.align-left, .figure.align-left, object.align-left {
clear: left ;
float: left ;
margin-right: 1em }
img.align-right, .figure.align-right, object.align-right {
clear: right ;
float: right ;
margin-left: 1em }
img.align-center, .figure.align-center, object.align-center {
display: block;
margin-left: auto;
margin-right: auto;
}
.align-left {
text-align: left }
.align-center {
clear: both ;
text-align: center }
.align-right {
text-align: right }
/* reset inner alignment in figures */
div.align-right {
text-align: inherit }
/* div.align-center * { */
/* text-align: left } */
ol.simple, ul.simple {
margin-bottom: 1em }
ol.arabic {
list-style: decimal }
ol.loweralpha {
list-style: lower-alpha }
ol.upperalpha {
list-style: upper-alpha }
ol.lowerroman {
list-style: lower-roman }
ol.upperroman {
list-style: upper-roman }
p.attribution {
text-align: right ;
margin-left: 50% }
p.caption {
font-style: italic }
p.credits {
font-style: italic ;
font-size: smaller }
p.label {
white-space: nowrap }
p.rubric {
font-weight: bold ;
font-size: larger ;
color: maroon ;
text-align: center }
p.sidebar-title {
font-family: sans-serif ;
font-weight: bold ;
font-size: larger }
p.sidebar-subtitle {
font-family: sans-serif ;
font-weight: bold }
p.topic-title {
font-weight: bold }
pre.address {
margin-bottom: 0 ;
margin-top: 0 ;
font: inherit }
pre.literal-block, pre.doctest-block, pre.math {
margin-left: 2em ;
margin-right: 2em }
span.classifier {
font-family: sans-serif ;
font-style: oblique }
span.classifier-delimiter {
font-family: sans-serif ;
font-weight: bold }
span.interpreted {
font-family: sans-serif }
span.option {
white-space: nowrap }
span.pre {
white-space: pre }
span.problematic {
color: red }
span.section-subtitle {
/* font-size relative to parent (h1..h6 element) */
font-size: 80% }
table.citation {
border-left: solid 1px gray;
margin-left: 1px }
table.docinfo {
margin: 2em 4em }
table.docutils {
margin-top: 0.5em ;
margin-bottom: 0.5em }
table.footnote {
border-left: solid 1px black;
margin-left: 1px }
table.docutils td, table.docutils th,
table.docinfo td, table.docinfo th {
padding-left: 0.5em ;
padding-right: 0.5em ;
vertical-align: top }
table.docutils th.field-name, table.docinfo th.docinfo-name {
font-weight: bold ;
text-align: left ;
white-space: nowrap ;
padding-left: 0 }
h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
font-size: 100% }
ul.auto-toc {
list-style-type: none }
</style>
</head>
<body>
<div class="document">
<dl class="docutils">
<dt><strong>git-start-branch</strong></dt>
<dd><p class="first"><em>Usage:</em> <tt class="docutils literal">git <span class="pre">start-branch</span> branch</tt></p>
<ul class="simple">
<li>Creates a new branch</li>
<li>Alias for git checkout -b branch</li>
</ul>
<p class="last">Designed to be a complement to the previously-coded git-finish-branch</p>
</dd>
<dt><strong>git-finish-branch</strong></dt>
<dd><p class="first"><em>Usage:</em> <tt class="docutils literal">git <span class="pre">finish-branch</span> branch [tag]</tt></p>
<ul class="simple">
<li>Merges a branch into the master branch (with no-ff)</li>
<li>Tags the merge with either the passed tag or the date in the
form <tt class="docutils literal">MMDDYYYY</tt></li>
<li>If you specify the tag, and the tag exists, it will fail</li>
<li>If you don't specify the tag, and the tag exists, it appends a number,
e.g. <tt class="docutils literal"><span class="pre">04012010-1</span></tt> or <tt class="docutils literal"><span class="pre">04012010-2</span></tt></li>
<li>Pushes the changes to the origin repository</li>
<li>Deletes the branch</li>
</ul>
<p class="last">Designed to finish up a local topic/feature branch</p>
</dd>
<dt><strong>git-pull-branch</strong></dt>
<dd><p class="first"><em>Usage:</em> <tt class="docutils literal">git <span class="pre">pull-branch</span> <branchname></tt></p>
<ul class="simple">
<li>Pulls the <tt class="docutils literal"><branchname></tt> branch from origin and tracks it</li>
</ul>
<p class="last">A simple shortcut to get a remote branch from the server.</p>
</dd>
<dt><strong>git-push-branch</strong></dt>
<dd><p class="first"><em>Usage:</em> <tt class="docutils literal">git <span class="pre">push-branch</span> <branchname></tt></p>
<ul class="simple">
<li>Pushes the <tt class="docutils literal"><branchname></tt> branch to origin</li>
<li>Tracks the branch so <tt class="docutils literal">git pull origin</tt> will also pull this branch</li>
</ul>
<p class="last">A simple shortcut to get a local branch on a server without having to
execute three different commands</p>
</dd>
<dt><strong>git-merge-branch</strong></dt>
<dd><p class="first"><em>Usage:</em> <tt class="docutils literal">git <span class="pre">merge-branch</span> <branchname></tt></p>
<blockquote class="last">
<ul class="simple">
<li>Merges a branch into the master branch (with no-ff)</li>
<li>Tags the merge with either the passed tag or the date in the
form <tt class="docutils literal">MMDDYYYY</tt></li>
<li>If you specify the tag, and the tag exists, it will fail</li>
<li>If you don't specify the tag, and the tag exists, it appends a number,
e.g. <tt class="docutils literal"><span class="pre">04012010-1</span></tt> or <tt class="docutils literal"><span class="pre">04012010-2</span></tt></li>
<li>Pushes the changes to the origin repository</li>
</ul>
<p>Similar to <tt class="docutils literal"><span class="pre">finish-branch</span></tt> without deleting the branch. Designed to merge a remote (long lasting) branch</p>
</blockquote>
</dd>
<dt><strong>git-move-commits</strong></dt>
<dd><p class="first"><em>Usage:</em> <tt class="docutils literal">git <span class="pre">move-commits</span> <span class="pre"><num-commits></span> <span class="pre"><correct-branch></span></tt></p>
<ul class="simple">
<li>Moves the last <tt class="docutils literal"><span class="pre">num-commits</span></tt> commits to <tt class="docutils literal"><span class="pre">correct-branch</span></tt></li>
<li>If <tt class="docutils literal"><span class="pre">correct-branch</span></tt> doesn't exist, the script creates it</li>
<li>if <tt class="docutils literal"><span class="pre">correct-branch</span></tt> does exist, the script merges the commits</li>
</ul>
<p class="last">If you commit to the wrong branch (especially <tt class="docutils literal">master</tt>), this script
will fix that for you.</p>
</dd>
<dt><strong>git-branch-from</strong></dt>
<dd><p class="first"><em>Usage:</em> <tt class="docutils literal">git <span class="pre">branch-from</span> <span class="pre"><commit-reference></span> <span class="pre"><new-branch-name></span></tt></p>
<p class="last">If you made several commits to a branch (especially <tt class="docutils literal">master</tt>), and in retrospect, you really should have been doing that on a new branch, this will create a new branch from the <tt class="docutils literal"><span class="pre">commit-reference</span></tt> and reset current branch to the <tt class="docutils literal"><span class="pre">commit-reference</span></tt>.</p>
</dd>
<dt><strong>git-export</strong></dt>
<dd><p class="first"><em>Usage:</em> <tt class="docutils literal">git export <span class="pre"><commit-reference></span> [<filename>]</tt></p>
<p class="last">Exports a tar-gzipped archive of the <tt class="docutils literal"><span class="pre">commit-reference</span></tt>. If <tt class="docutils literal"><filename></tt> is omitted, the archive is saved as <tt class="docutils literal"><span class="pre"><commit-reference>.tar.gz</span></tt>.</p>
</dd>
<dt><strong>git-status-u</strong></dt>
<dd><p class="first"><em>Usage:</em> <tt class="docutils literal">git <span class="pre">status-u</span></tt></p>
<ul class="simple">
<li>Git emulation of the Subversion command <tt class="docutils literal">svn status <span class="pre">-u</span></tt></li>
</ul>
<p class="last">If you want to know what is going to be updated when you pull in a remote
repository, this will show you.</p>
</dd>
<dt><strong>linkscripts</strong></dt>
<dd><p class="first"><em>Usage:</em> <tt class="docutils literal">linkscripts</tt></p>
<p>Simply creates a symbolic link for any script starting with <tt class="docutils literal">git-</tt> in
this directory to <tt class="docutils literal">/usr/local/bin</tt>.</p>
<p class="last">This is handy so you can easily update the scripts in a repository, and
have them located elsewhere, but still make them seen by git.</p>
</dd>
</dl>
</div>
</body>
</html>