Skip to content

Commit 436b4b5

Browse files
ItangSanjanaItangSanjana
committed
Copied index.html to index.id.html
1 parent 6a37941 commit 436b4b5

File tree

1 file changed

+272
-0
lines changed

1 file changed

+272
-0
lines changed

‎index.id.html

Lines changed: 272 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,272 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
6+
<title>git - the simple guide - no deep shit!</title>
7+
<link href='http://fonts.googleapis.com/css?family=Chelsea+Market' rel='stylesheet' type='text/css'>
8+
<link rel="stylesheet" href="css/normalize.css" type="text/css">
9+
<link rel="stylesheet" href="css/style.css" type="text/css">
10+
<script type="text/javascript">
11+
var _gaq = _gaq || [];
12+
_gaq.push(['_setAccount', 'UA-652147-13']);
13+
_gaq.push(['_trackPageview']);
14+
15+
(function() {
16+
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
17+
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
18+
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
19+
})();
20+
21+
function recordOutboundLink(link, category, action) {
22+
_gat._getTrackerByName()._trackEvent(category, action);
23+
setTimeout('document.location = "' + link.href + '"', 100);
24+
}
25+
</script>
26+
</head>
27+
<body>
28+
<div class="scrollblock block-title">
29+
<h1>git - the simple guide</h1>
30+
<p>just a simple guide for getting started with git. no deep shit ;)</p>
31+
<a href="https://twitter.com/share" class="twitter-share-button" data-via="rogerdudler" data-size="large" data-url="http://rogerdudler.github.com/git-guide" data-related="rogerdudler" data-hashtags="git">Tweet</a>
32+
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
33+
<p class="meta">
34+
by <a href="http://www.twitter.com/rogerdudler">Roger Dudler</a>
35+
<br />credits to <a href="http://www.twitter.com/tfnico">@tfnico</a>, <a href="http://www.twitter.com/fhd">@fhd</a> and <a href="http://www.namics.com">Namics</a><br />
36+
this guide in
37+
<a href="index.de.html">deutsch</a>,
38+
<a href="index.es.html">español</a>,
39+
<a href="index.fr.html">français</a>,
40+
<a href="index.it.html">italiano</a>,
41+
<a href="index.nl.html">nederlands</a>,
42+
<a href="index.pt_BR.html">português</a>,
43+
<a href="index.ru.html">русский</a>,
44+
<a href="index.tr.html">türkçe</a>,
45+
<br/>
46+
<a href="index.my.html">မြန်မာ</a>,
47+
<a href="index.ja.html">日本語</a>,
48+
<a href="index.zh.html">中文</a>,
49+
<a href="index.ko.html">한국어</a>
50+
<a href="index.vi.html">Vietnamese</a>
51+
<br />
52+
please report issues on <a href="https://github.com/rogerdudler/git-guide/issues">github</a>
53+
</p>
54+
<div class="announcement">
55+
<a href="http://frontify.com/?utm_source=gitguide&amp;utm_campaign=founder_frontify">
56+
<img src="http://frontify.com/assets/img/frontify-announcement-git.png" width="960" height="100" alt="Frontify - Collaboration for Web Designers &amp; Front-End Developers" />
57+
</a>
58+
</div>
59+
<img src="img/arrow.png" alt="" />
60+
</div>
61+
<!-- setup -->
62+
<a name="setup"></a>
63+
<div class="scrollblock block-setup">
64+
<h2>setup</h2>
65+
<p>
66+
<a href="http://code.google.com/p/git-osx-installer/downloads/list?can=3">Download git for OSX</a>
67+
</p>
68+
<p>
69+
<a href="http://msysgit.github.io/">Download git for Windows</a>
70+
</p>
71+
<p>
72+
<a href="http://book.git-scm.com/2_installing_git.html">Download git for Linux</a>
73+
</p>
74+
</div>
75+
<a name="create"></a>
76+
<div class="scrollblock block-create">
77+
<h2>create a new repository</h2>
78+
<p>
79+
create a new directory, open it and perform a <br />
80+
<code>git init</code><br />
81+
to create a new git repository.
82+
</p>
83+
</div>
84+
<a name="checkout"></a>
85+
<div class="scrollblock block-checkout">
86+
<h2>checkout a repository</h2>
87+
<p>
88+
create a working copy of a local repository by running the command<br />
89+
<code>git clone /path/to/repository</code><br />
90+
when using a remote server, your command will be<br />
91+
<code>git clone username@host:/path/to/repository</code>
92+
</p>
93+
</div>
94+
<a name="trees"></a>
95+
<div class="scrollblock block-trees">
96+
<h2>workflow</h2>
97+
<p>
98+
your local repository consists of three "trees" maintained by git.
99+
the first one is your <code>Working Directory</code> which holds the actual files.
100+
the second one is the <code>Index</code> which acts as a staging area and
101+
finally the <code>HEAD</code> which points to the last commit you've made.
102+
</p>
103+
<img src="img/trees.png" alt="" />
104+
</div>
105+
<a name="add"></a>
106+
<div class="scrollblock block-add">
107+
<h2>add &amp; commit</h2>
108+
<p>
109+
You can propose changes (add it to the <b>Index</b>) using<br />
110+
<code>git add &lt;filename&gt;</code><br />
111+
<code>git add *</code><br />
112+
This is the first step in the basic git workflow. To actually commit these changes use<br />
113+
<code>git commit -m "Commit message"</code><br />
114+
Now the file is committed to the <b>HEAD</b>, but not in your remote repository yet.
115+
</p>
116+
</div>
117+
<a name="push"></a>
118+
<div class="scrollblock block-remote">
119+
<h2>pushing changes</h2>
120+
<p>
121+
Your changes are now in the <b>HEAD</b> of your local working copy. To send those changes to your remote repository, execute <br />
122+
<code>git push origin master</code><br />
123+
Change <i>master</i> to whatever branch you want to push your changes to.
124+
<br /><br />
125+
If you have not cloned an existing repository and want to connect your repository to a remote server, you need to add it with<br />
126+
<code>git remote add origin &lt;server&gt;</code><br />
127+
Now you are able to push your changes to the selected remote server<br />
128+
129+
</p>
130+
</div>
131+
<a name="branching"></a>
132+
<div class="scrollblock block-branching">
133+
<h2>branching</h2>
134+
<p>
135+
Branches are used to develop features isolated from each other. The <i>master</i> branch is the "default" branch when you create a repository. Use other branches for development and merge them back to the master branch upon completion.
136+
</p>
137+
<img src="img/branches.png" alt="" />
138+
<p>
139+
create a new branch named "feature_x" and switch to it using<br />
140+
<code>git checkout -b feature_x</code><br />
141+
switch back to master<br />
142+
<code>git checkout master</code><br />
143+
and delete the branch again<br />
144+
<code>git branch -d feature_x</code><br />
145+
a branch is <i>not available to others</i> unless you push the branch to your remote repository<br />
146+
<code>git push origin &lt;branch&gt;</code>
147+
</p>
148+
</div>
149+
<a name="update"></a>
150+
<div class="scrollblock block-merging">
151+
<h2>update &amp; merge</h2>
152+
<p>
153+
to update your local repository to the newest commit, execute <br />
154+
<code>git pull</code><br />
155+
in your working directory to <i>fetch</i> and <i>merge</i> remote changes.<br />
156+
to merge another branch into your active branch (e.g. master), use<br />
157+
<code>git merge &lt;branch&gt;</code><br />
158+
in both cases git tries to auto-merge changes. Unfortunately, this is not always possible and results in <i>conflicts</i>.
159+
You are responsible to merge those <i>conflicts</i>
160+
manually by editing the files shown by git. After changing, you need to mark them as merged with<br />
161+
<code>git add &lt;filename&gt;</code><br />
162+
before merging changes, you can also preview them by using<br />
163+
<code>git diff &lt;source_branch&gt; &lt;target_branch&gt;</code>
164+
</p>
165+
</div>
166+
<a name="tagging"></a>
167+
<div class="scrollblock block-tagging">
168+
<h2>tagging</h2>
169+
<p>
170+
it's recommended to create tags for software releases. this is a known concept, which also exists in SVN. You can create a new tag named <i>1.0.0</i> by executing<br />
171+
<code>git tag 1.0.0 1b2e1d63ff</code><br />
172+
the <i>1b2e1d63ff</i> stands for the first 10 characters of the commit id you want to reference with your tag. You can get the commit id by looking at the... <br />
173+
</p>
174+
</div>
175+
<a name="log"></a>
176+
<div class="scrollblock block-log">
177+
<h2>log</h2>
178+
<p>
179+
in its simplest form, you can study repository history using..
180+
<code>git log</code><br />
181+
You can add a lot of parameters to make the log look like what you want. To see only the commits of a certain author:<br />
182+
<code>git log --author=bob</code><br />
183+
To see a very compressed log where each commit is one line:<br />
184+
<code>git log --pretty=oneline</code><br />
185+
Or mabe you want to see an ASCII art tree of all the branches, decorated with the names of tags and branches: <br />
186+
<code>git log --graph --oneline --decorate --all</code><br />
187+
See only which files have changed: <br />
188+
<code>git log --name-status</code><br />
189+
These are just a few of the possible parameters you can use. For more, see
190+
<code>git log --help</code><br />
191+
</p>
192+
</div>
193+
<a name="checkout-replace"></a>
194+
<div class="scrollblock block-checkout-replace">
195+
<h2>replace local changes</h2>
196+
<p>
197+
In case you did something wrong (which for sure never happens ;) you can replace local changes using the command<br />
198+
<code>git checkout -- &lt;filename&gt;</code><br />
199+
this replaces the changes in your working tree with the last content in HEAD. Changes already added to the index, as well as new files, will be kept.
200+
</p>
201+
<p>
202+
If you instead want to drop all your local changes and commits, fetch the latest history from the server and point your local master branch at it like this<br />
203+
<code>git fetch origin</code><br />
204+
<code>git reset --hard origin/master</code>
205+
</p>
206+
</div>
207+
<a name="hints"></a>
208+
<div class="scrollblock block-hints">
209+
<h2>useful hints</h2>
210+
<p>
211+
built-in git GUI<br />
212+
<code>gitk</code><br />
213+
use colorful git output<br />
214+
<code>git config color.ui true</code><br />
215+
show log on just one line per commit<br />
216+
<code>git config format.pretty oneline</code><br />
217+
use interactive adding<br />
218+
<code>git add -i</code>
219+
</p>
220+
</div>
221+
<a name="resources"></a>
222+
<div class="scrollblock block-resources">
223+
<h2>links & resources</h2>
224+
<h3>graphical clients</h3>
225+
<p>
226+
<ul>
227+
<li><a href="http://gitx.laullon.com/">GitX (L) (OSX, open source)</a></li>
228+
<li><a href="http://www.git-tower.com/">Tower (OSX)</a></li>
229+
<li><a href="http://www.sourcetreeapp.com/">Source Tree (OSX & Windows, free)</a></li>
230+
<li><a href="http://mac.github.com/">GitHub for Mac (OSX, free)</a></li>
231+
<li><a href="https://itunes.apple.com/gb/app/gitbox/id403388357?mt=12">GitBox (OSX, App Store)</a></li>
232+
</ul>
233+
</p>
234+
<h3>guides</h3>
235+
<p>
236+
<ul>
237+
<li><a href="http://book.git-scm.com/">Git Community Book</a></li>
238+
<li><a href="http://progit.org/book/">Pro Git</a></li>
239+
<li><a href="http://think-like-a-git.net/">Think like a git</a></li>
240+
<li><a href="http://help.github.com/">GitHub Help</a></li>
241+
<li><a href="http://marklodato.github.com/visual-git-guide/index-en.html">A Visual Git Guide</a></li>
242+
</ul>
243+
</p>
244+
<h3>get help</h3>
245+
<p>
246+
<ul>
247+
<li><a href="http://groups.google.com/group/git-users/">Git User Mailing List</a></li>
248+
<li><a href="http://jk.gs/git/">#git on irc.freenode.net</a></li>
249+
</ul>
250+
</p>
251+
</div>
252+
<a name="comments"></a>
253+
<div class="scrollblock block-comments">
254+
<h2>comments</h2>
255+
<div id="disqus_thread"></div>
256+
<script type="text/javascript">
257+
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
258+
var disqus_shortname = 'git-the-simple-guide'; // required: replace example with your forum shortname
259+
260+
/* * * DON'T EDIT BELOW THIS LINE * * */
261+
(function() {
262+
var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
263+
dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
264+
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
265+
})();
266+
</script>
267+
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
268+
</div>
269+
<a href="http://www.git-tower.com/?source=rd" onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
270+
<a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;" class="cheatsheet"></a>
271+
</body>
272+
</html>

0 commit comments

Comments
 (0)