forked from collective/Collective
-
Notifications
You must be signed in to change notification settings - Fork 0
/
new_to_git.html
214 lines (198 loc) · 9.94 KB
/
new_to_git.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
<!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">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>New to git? — collective.github.com - Last updated: Apr 12, 2012</title>
<link rel="stylesheet" href="_static/custom.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: '',
VERSION: 'Last updated: Apr 12, 2012',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
};
</script>
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="search" type="application/opensearchdescription+xml"
title="Search within collective.github.com - Last updated: Apr 12, 2012"
href="_static/opensearch.xml"/>
<link rel="shortcut icon" href="_static/favicon.ico"/>
<link rel="top" title="collective.github.com - Last updated: Apr 12, 2012" href="index.html" />
<link rel="next" title="How to merge pull requests (Admin documentation)" href="how_to_merge.html" />
<link rel="prev" title="How to update this page" href="how_to_update_this_documentation.html" />
<script src="_static/jquery.min.js" type="text/javascript"></script>
<script src="_static/jquery.zrssfeed.min.js" type="text/javascript"></script>
</head>
<body>
<div class="related">
<h3>Navigation</h3>
<ul>
<li class="right" style="margin-right: 10px">
<a href="genindex.html" title="General Index"
accesskey="I">index</a></li>
<li class="right" >
<a href="how_to_merge.html" title="How to merge pull requests (Admin documentation)"
accesskey="N">next</a> |</li>
<li class="right" >
<a href="how_to_update_this_documentation.html" title="How to update this page"
accesskey="P">previous</a> |</li>
<li><a href="index.html">collective.github.com - Last updated: Apr 12, 2012</a> »</li>
</ul>
</div>
<div class="document">
<div class="sphinxsidebar">
<div class="sphinxsidebarwrapper">
<p class="logo"><a href="index.html">
<img class="logo" src="_static/logo.png" alt="Logo"/>
</a></p>
<div id="searchbox" style="display: none">
<h3>Quick search</h3>
<form class="search" action="search.html" method="get">
<input type="text" name="q" />
<input type="submit" value="Go" />
<input type="hidden" name="check_keywords" value="yes" />
<input type="hidden" name="area" value="default" />
</form>
<p class="searchtip" style="font-size: 90%">
Enter search terms or a module, class or function name.
</p>
</div>
<script type="text/javascript">$('#searchbox').show(0);</script>
<h3><a href="index.html">Table Of Contents</a></h3>
<ul class="current">
<li class="toctree-l1"><a class="reference internal" href="how_to_followcommits.html">How to follow commits</a></li>
<li class="toctree-l1"><a class="reference internal" href="how_to_update_this_documentation.html">How to update this page</a></li>
<li class="toctree-l1 current"><a class="current reference internal" href="">New to git?</a><ul>
<li class="toctree-l2"><a class="reference internal" href="#useful-links">Useful links</a></li>
<li class="toctree-l2"><a class="reference internal" href="#quick-guide">Quick guide</a></li>
<li class="toctree-l2"><a class="reference internal" href="#some-more-useful-resources">Some more useful resources</a></li>
</ul>
</li>
<li class="toctree-l1"><a class="reference internal" href="how_to_merge.html">How to merge pull requests (Admin documentation)</a></li>
</ul>
</div>
</div>
<script type="text/javascript">
$(document).ready(function () {
$('#zrssfeed-collective').rssfeed('https://github.com/collective.atom', {
limit: 5
});
});
</script>
<div id="zrssfeed-collective"></div>
<div class="documentwrapper">
<div class="bodywrapper">
<div class="body">
<div class="section" id="new-to-git">
<h1>New to git?<a class="headerlink" href="#new-to-git" title="Permalink to this headline">¶</a></h1>
<div class="section" id="useful-links">
<h2>Useful links<a class="headerlink" href="#useful-links" title="Permalink to this headline">¶</a></h2>
<blockquote>
<div><ul class="simple">
<li><a class="reference external" href="http://gitref.org">http://gitref.org</a></li>
<li><a class="reference external" href="http://www.gitready.com">http://www.gitready.com</a></li>
<li><a class="reference external" href="http://progit.org/book">http://progit.org/book</a></li>
</ul>
</div></blockquote>
</div>
<div class="section" id="quick-guide">
<h2>Quick guide<a class="headerlink" href="#quick-guide" title="Permalink to this headline">¶</a></h2>
<p>When I switched to git I got used to a specific git workflow, inspired
by my previous experience with subversion. These are just a handful of
commands and a tiny bit of git’s full capabilities but it may be useful
for you as well. (by <a class="reference external" href="mailto:raggam-nl%40adm.at">Johannes Raggam</a>)</p>
<div class="section" id="global-settings">
<h3>Global Settings<a class="headerlink" href="#global-settings" title="Permalink to this headline">¶</a></h3>
<p>Essential</p>
<div class="highlight-console"><div class="highlight"><pre><span class="gp">$</span> git config --global user.name <span class="s2">"USERS NAME"</span>
<span class="gp">$</span> git config --global user.email USERS@EMAIL
</pre></div>
</div>
<p>Create global <tt class="docutils literal"><span class="pre">gitignore</span></tt></p>
<div class="highlight-console"><div class="highlight"><pre><span class="gp">$</span> <span class="nb">echo</span> -e <span class="s2">"*.mo\n*.pyc\n*.pyo"</span> > ~/.gitignore
<span class="gp">$</span> git config --global core.excludesfile ~/.gitignore
</pre></div>
</div>
</div>
<div class="section" id="cloning">
<h3>Cloning<a class="headerlink" href="#cloning" title="Permalink to this headline">¶</a></h3>
<div class="highlight-console"><div class="highlight"><pre><span class="gp">$</span> git clone [email protected]:USERNAME/REPOSITORYNAME.git
</pre></div>
</div>
</div>
<div class="section" id="creating">
<h3>Creating<a class="headerlink" href="#creating" title="Permalink to this headline">¶</a></h3>
<p>First, create a github project on <a class="reference external" href="https://github.com/organizations/collective">github.com collective</a></p>
<p>Second, create a project on your local computer and initialize it</p>
<div class="highlight-console"><div class="highlight"><pre><span class="gp">$</span> mkdir PROJECT
<span class="gp">$</span> <span class="nb">cd </span>PROJECT
<span class="gp">$</span> git init <span class="c"># initialize git versioning in current directory</span>
<span class="gp">$</span> git remote add origin [email protected]:collective/REPOSITORYNAME.git
</pre></div>
</div>
<p>These settings will let you push with just “git push” as command</p>
<div class="highlight-console"><div class="highlight"><pre><span class="gp">$</span> git config branch.master.merge refs/heads/master
<span class="gp">$</span> git config branch.master.remote origin
</pre></div>
</div>
<p>Create local <tt class="docutils literal"><span class="pre">gitignore</span></tt></p>
<div class="highlight-console"><pre>$ echo -e "bin\ndev\ndevelop-eggs\neggs\nparts\n*.egg-info\n.*
\n!.gitignore" > .gitignore</pre>
</div>
<p>Add files, commit and push</p>
<div class="highlight-console"><div class="highlight"><pre><span class="gp">$</span> git add . <span class="c"># add current dir and subdirs to project</span>
<span class="gp">$</span> git commit -am<span class="s2">"MESSAGE"</span> <span class="c"># commit all staged changes</span>
<span class="gp">$</span> git commit FILE -m<span class="s2">"MESSAGE"</span> <span class="c"># commit FILE</span>
<span class="gp">$</span> git push <span class="c"># push changes to master on github</span>
<span class="gp">$</span> git pull <span class="c"># update</span>
<span class="gp">$</span> git fetch <span class="c"># or so</span>
</pre></div>
</div>
</div>
</div>
<div class="section" id="some-more-useful-resources">
<h2>Some more useful resources<a class="headerlink" href="#some-more-useful-resources" title="Permalink to this headline">¶</a></h2>
<blockquote>
<div><ul>
<li><dl class="first docutils">
<dt>Interesting doc about git rebasing instead of merging branches:</dt>
<dd><p class="first last"><a class="reference external" href="http://jbowes.wordpress.com/2007/01/26/git-rebase-keeping-your-branches-current">http://jbowes.wordpress.com/2007/01/26/git-rebase-keeping-your-branches-current</a></p>
</dd>
</dl>
</li>
</ul>
</div></blockquote>
</div>
</div>
</div>
</div>
</div>
<div class="clearer"></div>
</div>
<div class="related">
<h3>Navigation</h3>
<ul>
<li class="right" style="margin-right: 10px">
<a href="genindex.html" title="General Index"
>index</a></li>
<li class="right" >
<a href="how_to_merge.html" title="How to merge pull requests (Admin documentation)"
>next</a> |</li>
<li class="right" >
<a href="how_to_update_this_documentation.html" title="How to update this page"
>previous</a> |</li>
<li><a href="index.html">collective.github.com - Last updated: Apr 12, 2012</a> »</li>
</ul>
</div>
<div class="footer">
© Copyright 2010, Rok Garbas <[email protected]>.
Last updated on Apr 12, 2012.
Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> 1.1.3.
</div>
</body>
</html>