diff --git a/css/style.css b/css/style.css
index 6fff86a9..84a16b2a 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1,178 +1,357 @@
+@import url('https://fonts.googleapis.com/css2?family=Chelsea+Market&family=Indie+Flower&display=swap');
+
body {
- background: #FFF;
- font-family: Georgia, Times New Roman, Times, serif;
- font-size: 30px;
- text-align: center;
- margin: 0;
- padding: 0;
+ background: #FFF;
+ font-family: 'Indie Flower', Georgia, Times New Roman, Times, serif;
+ font-size: 30px;
+ text-align: center;
+ margin: 0;
+ padding: 0;
}
h1 {
- font-size: 60px;
- font-weight: normal;
- margin: 0;
- font-family: 'Chelsea Market', Georgia, serif;
- color: #000;
- line-height: 1;
+ font-size: 60px;
+ font-weight: normal;
+ margin: 0;
+ font-family: 'Chelsea Market', Georgia, serif;
+ color: #000;
+ line-height: 1;
}
h2 {
- font-size: 70px;
- font-weight: normal;
- margin: 0;
- color: #FFB000;
- font-family: 'Chelsea Market', Georgia, serif;
- text-transform: lowercase;
+ font-size: 70px;
+ font-weight: normal;
+ margin: 0;
+ color: #FFB000;
+ font-family: 'Chelsea Market', Georgia, serif;
+ text-transform: lowercase;
}
h3 {
- font-size: 40px;
- font-weight: normal;
- margin: 0;
- margin-top: 40px;
- text-transform: lowercase;
+ font-size: 40px;
+ font-weight: normal;
+ margin: 0;
+ margin-top: 40px;
+ text-transform: lowercase;
}
p {
- width: 960px;
- margin: 40px auto;
- color: #000;
- line-height: 200%;
+ width: 960px;
+ margin: 40px auto;
+ color: #000;
+ line-height: 200%;
+ font-weight: 600;
}
-a, a:visited {
- color: #000;
- font-size: 12px;
- text-decoration: none;
+a,
+a:visited {
+ color: #000;
+ font-size: 12px;
+ text-decoration: none;
}
a:hover {
- text-decoration: underline;
+ text-decoration: underline;
}
ul {
- list-style: none;
+ list-style: none;
}
.download {
- padding: 10px;
+ padding: 10px;
}
pre {
- font-size: 18px;
+ font-size: 18px;
}
blockquote {
- text-align: left;
- width: 720px;
- margin: 10px auto;
- background: #C5C3DE;
- border: solid 2px #69697A;
- padding: 0 40px;
+ text-align: left;
+ width: 720px;
+ margin: 10px auto;
+ background: #C5C3DE;
+ border: solid 2px #69697A;
+ padding: 0 40px;
}
code {
- background-color: #000;
- font-style: normal;
- border-radius: 10px;
- color: white;
- padding: 5px 15px;
- font-family: menlo, monospace;
+ background-color: #000;
+ font-style: normal;
+ border-radius: 10px;
+ color: white;
+ padding: 5px 15px;
+ font-family: menlo, monospace;
+ font-weight: 400;
}
/*---------------------------------------- BLOCKS */
.scrollblock {
- position: relative;
- margin: 0;
- width: 100%;
- color: white;
- padding-top: 80px;
- padding-bottom: 80px;
-}
-
-.scrollblock h2 {
-
-}
-
-.block-title { background-color: #FFF; padding-bottom: 50px; }
-.block-title h2 { color: #000; }
-.block-title .meta { font-size: 16px; color: #999; }
-.block-title .meta a { font-size: 16px; color: #333; }
-.block-setup { background-color: #348fd4; }
-.block-setup h2 { color: #06406c; }
-.block-setup h2 a { background: none; padding: 0; font-size: normal; }
-.block-setup a { color: #FFF; font-size: 40px; font-weight: normal;font-style: normal; background-color: #06406c; padding: 10px 15px; border-radius: 10px; text-decoration: none; }
-.block-setup a:hover { text-decoration: underline; }
-.block-create { background-color: #06406c; }
-.block-create h2 { color: #FFF; }
-.block-create p { color: #FFF; }
-.block-create code { background-color: #000; color: #FFF; }
-.block-checkout { background-color: #FFF; }
-.block-checkout h2 { color: #000; }
-.block-trees { background-color: #4c0d09; }
-.block-trees h2 { color: #d3b2af; }
-.block-trees p { color: #d3b2af; }
-.block-trees code { color: #000; background-color: white; }
-.block-add { background-color: #cc4037; }
-.block-add h2, .block-add p { color: #4c0d09; }
-.block-remote { background-color: #ffc19f; }
-.block-remote h2 { color: #cc4037; }
-.block-branching { background-color: #000; }
-.block-branching h2 { color: #FFF; }
-.block-branching p { color: #DDD; }
-.block-branching code { color: #000; background-color: white; }
-.block-merging { background-color: #F2F2F2; }
-.block-merging h2 { color: #666; }
-.block-tagging { background-color: #F2F2F2; }
-.block-tagging h2 { color: #FFF; }
-.block-hints { background-color: #F2F2F2; }
-.block-hints h2 { color: #FFF; }
-.block-resources { background-color: #ffc19f; }
-.block-resources h2 { color: #cc4037; }
-.block-resources h3 { color: #7d1f19; }
-.block-resources ul { list-style: disc; margin: 0; padding: 0; }
-.block-resources ul li a { font-size: 24px; color: #cc4037; }
-.block-tagging { background-color: #348fd4; }
-.block-tagging h2 { color: #06406c; }
-.block-hints { background-color: #06406c; }
-.block-hints h2 { color: #FFF; }
-.block-hints p { color: #FFF; }
-.block-hints code { background-color: #000; color: #FFF; }
-.block-checkout-replace { background-color: #fff8c9; }
-.block-checkout-replace h2 { color: #2d2700; }
-.block-checkout-replace p { color: #615400; }
-.block-comments { background-color: #FFF; padding-bottom: 50px; font-size: 14px; color: #000; }
-.block-comments h2 { color: #000; }
-.block-comments h3 { font-size: 16px; }
-.block-comments #disqus_thread { width: 600px; text-align: left; margin-left: auto; margin-right: auto; }
+ position: relative;
+ margin: 0;
+ width: 100%;
+ color: white;
+ padding-top: 80px;
+ padding-bottom: 80px;
+}
+
+.block-title {
+ background-color: #FFF;
+ padding-bottom: 50px;
+}
+
+.block-title h2 {
+ color: #000;
+}
+
+.block-title .meta {
+ font-size: 20px;
+ color: #999;
+}
+
+.block-title .meta a {
+ font-size: 20px;
+ color: #333;
+}
+
+.block-setup {
+ background-color: #348fd4;
+}
+
+.block-setup h2 {
+ color: #06406c;
+}
+
+.block-setup h2 a {
+ background: none;
+ padding: 0;
+ font-size: normal;
+}
+
+.block-setup a {
+ color: #FFF;
+ font-size: 40px;
+ font-weight: normal;
+ font-style: normal;
+ background-color: #06406c;
+ padding: 10px 15px;
+ border-radius: 10px;
+ text-decoration: none;
+}
+
+.block-setup a:hover {
+ text-decoration: underline;
+}
+
+.block-create {
+ background-color: #06406c;
+}
+
+.block-create h2 {
+ color: #FFF;
+}
+
+.block-create p {
+ color: #FFF;
+}
+
+.block-create code {
+ background-color: #000;
+ color: #FFF;
+}
+
+.block-checkout {
+ background-color: #FFF;
+}
+
+.block-checkout h2 {
+ color: #000;
+}
+
+.block-trees {
+ background-color: #4c0d09;
+}
+
+.block-trees h2 {
+ color: #d3b2af;
+}
+
+.block-trees p {
+ color: #d3b2af;
+}
+
+.block-trees code {
+ color: #000;
+ background-color: white;
+}
+
+.block-add {
+ background-color: #cc4037;
+}
+
+.block-add h2,
+.block-add p {
+ color: #4c0d09;
+}
+
+.block-remote {
+ background-color: #ffc19f;
+}
+
+.block-remote h2 {
+ color: #cc4037;
+}
+
+.block-branching {
+ background-color: #000;
+}
+
+.block-branching h2 {
+ color: #FFF;
+}
+
+.block-branching p {
+ color: #DDD;
+}
+
+.block-branching code {
+ color: #000;
+ background-color: white;
+}
+
+.block-merging {
+ background-color: #F2F2F2;
+}
+
+.block-merging h2 {
+ color: #666;
+}
+
+.block-tagging {
+ background-color: #F2F2F2;
+}
+
+.block-tagging h2 {
+ color: #FFF;
+}
+
+.block-hints {
+ background-color: #F2F2F2;
+}
+
+.block-hints h2 {
+ color: #FFF;
+}
+
+.block-resources {
+ background-color: #ffc19f;
+}
+
+.block-resources h2 {
+ color: #cc4037;
+}
+
+.block-resources h3 {
+ color: #7d1f19;
+}
+
+.block-resources ul {
+ list-style: disc;
+ margin: 0;
+ padding: 0;
+}
+
+.block-resources ul li a {
+ font-size: 24px;
+ color: #cc4037;
+}
+
+.block-tagging {
+ background-color: #348fd4;
+}
+
+.block-tagging h2 {
+ color: #06406c;
+}
+
+.block-hints {
+ background-color: #06406c;
+}
+
+.block-hints h2 {
+ color: #FFF;
+}
+
+.block-hints p {
+ color: #FFF;
+}
+
+.block-hints code {
+ background-color: #000;
+ color: #FFF;
+}
+
+.block-checkout-replace {
+ background-color: #fff8c9;
+}
+
+.block-checkout-replace h2 {
+ color: #2d2700;
+}
+
+.block-checkout-replace p {
+ color: #615400;
+}
+
+.block-comments {
+ background-color: #FFF;
+ padding-bottom: 50px;
+ font-size: 14px;
+ color: #000;
+}
+
+.block-comments h2 {
+ color: #000;
+}
+
+.block-comments h3 {
+ font-size: 16px;
+}
+
+.block-comments #disqus_thread {
+ width: 600px;
+ text-align: left;
+ margin-left: auto;
+ margin-right: auto;
+}
.tower {
- display: block;
- width: 180px;
- height: 260px;
- position: absolute;
- top: 330px;
- right: 0;
- background: #FFF url(../img/git-tower.png) no-repeat;
+ display: block;
+ width: 180px;
+ height: 260px;
+ position: absolute;
+ top: 330px;
+ right: 0;
+ background: #FFF url(../img/git-tower.png) no-repeat;
}
.cheatsheet {
- display: block;
- width: 180px;
- height: 250px;
- position: absolute;
- top: 346px;
- left: 0;
- background: #FFF url(../img/cheatsheet.png) no-repeat;
+ display: block;
+ width: 180px;
+ height: 250px;
+ position: absolute;
+ top: 346px;
+ left: 0;
+ background: #FFF url(../img/cheatsheet.png) no-repeat;
}
.announcement {
- margin-bottom: 40px;
+ margin-bottom: 40px;
}
.announcement img {
- border-radius: 4px;
+ border-radius: 4px;
}
#carbonads {
@@ -180,7 +359,7 @@ code {
overflow: hidden;
padding: 10px;
background-color: #dfdfdf;
- border-radius: 3px;
+ border-radius: 3px;
max-width: 300px;
margin: 0 auto;
font-family: Verdana, "Helvetica Neue", Helvetica, sans-serif;
@@ -207,7 +386,9 @@ code {
margin-right: 1em;
}
-.carbon-img img { display: block; }
+.carbon-img img {
+ display: block;
+}
.carbon-text {
display: block;
@@ -224,4 +405,4 @@ code {
text-transform: uppercase;
letter-spacing: 1px;
font-size: 9px;
-}
+}
\ No newline at end of file
diff --git a/index.de.html b/index.de.html
index b3f9acba..1293547c 100644
--- a/index.de.html
+++ b/index.de.html
@@ -1,37 +1,56 @@
<!DOCTYPE html>
<html lang="de">
+
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>git - Der einfache Einstieg - kein Schnick-schnack!</title>
- <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Chelsea+Market">
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/normalize/0/normalize.min.css">
<link rel="stylesheet" href="css/style.css">
<script>
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-652147-13']);
- _gaq.push(['_trackPageview']);
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-652147-13']);
+ _gaq.push(['_trackPageview']);
+
+ (function () {
+ var ga = document.createElement('script');
+ ga.type = 'text/javascript';
+ ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') +
+ '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(ga, s);
+ })();
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
- function recordOutboundLink(link, category, action) {
- _gat._getTrackerByName()._trackEvent(category, action);
- setTimeout('document.location = "' + link.href + '"', 100);
- }
+ function recordOutboundLink(link, category, action) {
+ _gat._getTrackerByName()._trackEvent(category, action);
+ setTimeout('document.location = "' + link.href + '"', 100);
+ }
</script>
</head>
+
<body>
<div class="scrollblock block-title">
<h1>git - Der einfache Einstieg</h1>
<p>eine einfache Anleitung, um git zu lernen. Kein Schnick-Schnack ;)</p>
- <a href="https://twitter.com/share" class="twitter-share-button" data-via="rogerdudler" data-url="http://rogerdudler.github.com/git-guide" data-size="large" data-related="rogerdudler" data-hashtags="git">Tweet</a>
- <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>
+ <a href="https://twitter.com/share" class="twitter-share-button" data-via="rogerdudler"
+ data-url="http://rogerdudler.github.com/git-guide" data-size="large" data-related="rogerdudler"
+ data-hashtags="git">Tweet</a>
+ <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>
<p class="meta">
von <a href="http://twitter.com/rogerdudler">Roger Dudler</a>
- <br>Dank an <a href="http://twitter.com/tfnico">@tfnico</a>, <a href="http://twitter.com/fhd">@fhd</a> und <a href="http://namics.com">Namics</a><br>
+ <br>Dank an <a href="http://twitter.com/tfnico">@tfnico</a>, <a href="http://twitter.com/fhd">@fhd</a> und
+ <a href="http://namics.com">Namics</a><br>
diese Anleitung in
<a href="index.html">english</a>,
<a href="index.es.html">español</a>,
@@ -114,11 +133,14 @@ <h2>add & commit</h2>
<div class="scrollblock block-remote">
<h2>Änderungen hochladen</h2>
<p>
- Die Änderungen sind jetzt im <b>HEAD</b> deines lokalen Repositories. Um die Änderungen an dein entferntes Repository zu senden, führe:<br>
+ Die Änderungen sind jetzt im <b>HEAD</b> deines lokalen Repositories. Um die Änderungen an dein entferntes
+ Repository zu senden, führe:<br>
<code>git push origin master</code><br>
- aus. Du kannst <i>master</i> auch mit einem beliebigen anderen Branch ersetzen, mehr über Branches erfährst du später.
+ aus. Du kannst <i>master</i> auch mit einem beliebigen anderen Branch ersetzen, mehr über Branches erfährst
+ du später.
<br><br>
- Wenn du dein lokales Repository nicht von einem entfernten geklont hast und du diese aber mit einem anderen Repository verbinden möchtest, musst du dieses mit <br>
+ Wenn du dein lokales Repository nicht von einem entfernten geklont hast und du diese aber mit einem anderen
+ Repository verbinden möchtest, musst du dieses mit <br>
<code>git remote add origin <server></code><br>
hinzufügen. Jetzt bist du bereit, deine Änderungen hochzuladen<br>
</p>
@@ -127,7 +149,10 @@ <h2>Änderungen hochladen</h2>
<div class="scrollblock block-branching">
<h2>Branching</h2>
<p>
- Branches werden benutzt, um verschiedene Funktionen isoliert voneinander zu entwickeln. Der <i>master</i>-Branch ist der "Standard"-Branch, wenn du ein neues Repository erstellst. Du solltest aber für die Entwicklung andere Branches verwenden und diese dann in den Master-Branch zusammenführen (mergen). Auch das lernst du später.
+ Branches werden benutzt, um verschiedene Funktionen isoliert voneinander zu entwickeln. Der
+ <i>master</i>-Branch ist der "Standard"-Branch, wenn du ein neues Repository erstellst. Du solltest aber für
+ die Entwicklung andere Branches verwenden und diese dann in den Master-Branch zusammenführen (mergen). Auch
+ das lernst du später.
</p>
<img src="img/branches.png" alt="">
<p>
@@ -147,10 +172,12 @@ <h2>update & merge</h2>
<p>
Um dein lokales Repository mit den neuesten Änderungen zu aktualisieren, verwende:<br>
<code>git pull</code><br>
- in deiner Arbeitskopie, um die Änderungen erst <i>herunterzuladen (fetch)</i> und dann mit deinem Stand <i>zusammenzuführen (merge)</i>.<br>
+ in deiner Arbeitskopie, um die Änderungen erst <i>herunterzuladen (fetch)</i> und dann mit deinem Stand
+ <i>zusammenzuführen (merge)</i>.<br>
Wenn du einen anderen Branch mit deinem aktuellen (z.B. master) zusammenführen willst, benutze:<br>
<code>git merge <branch></code><br>
- In beiden Fällen versucht git die Änderungen automatisch zusammenzuführen. Unglücklicherweise ist dies nicht immer möglich und endet in <i>Konflikten</i>.
+ In beiden Fällen versucht git die Änderungen automatisch zusammenzuführen. Unglücklicherweise ist dies nicht
+ immer möglich und endet in <i>Konflikten</i>.
Du bist verantwortlich, diese <i>Konflikte</i> durch manuelles Editieren der betroffenen Dateien zu lösen.
Bist du damit fertig, musst du das git mit folgendem Befehl mitteilen:<br>
<code>git add <dateiname></code><br>
@@ -162,9 +189,11 @@ <h2>update & merge</h2>
<div class="scrollblock block-tagging">
<h2>Tagging</h2>
<p>
- Es wird empfohlen, für Software Releasestags zu verwenden. Dies ist ein bekanntes Konzept, das es schon mit SVN gab. Du kannst einen neuen Tag namens <i>1.0.0</i> mit folgendem Befehl erstellen:<br>
+ Es wird empfohlen, für Software Releasestags zu verwenden. Dies ist ein bekanntes Konzept, das es schon mit
+ SVN gab. Du kannst einen neuen Tag namens <i>1.0.0</i> mit folgendem Befehl erstellen:<br>
<code>git tag 1.0.0 1b2e1d63ff</code><br>
- <i>1b2e1d63ff</i> steht für die ersten 10 Zeichen der Commit-Id, die du mit deinem Tag referenzieren möchtest. Du erhältst die Liste der Commit-IDs mit: <br>
+ <i>1b2e1d63ff</i> steht für die ersten 10 Zeichen der Commit-Id, die du mit deinem Tag referenzieren
+ möchtest. Du erhältst die Liste der Commit-IDs mit: <br>
<code>git log</code><br>
Du kannst auch weniger Zeichen verwenden, es muss einfach eindeutig sein.
</p>
@@ -175,10 +204,12 @@ <h2>Änderungen rückgängig machen</h2>
<p>
Falls du mal etwas falsch machst (was natürlich nie passiert ;) ) kannst du die lokalen Änderungen mit:<br>
<code>git checkout -- <filename></code><br>
- auf den letzten Stand im HEAD zurücksetzen. Änderungen, die du bereits zum Index hinzugefügt hast, bleiben bestehen.
+ auf den letzten Stand im HEAD zurücksetzen. Änderungen, die du bereits zum Index hinzugefügt hast, bleiben
+ bestehen.
</p>
<p>
- Wenn du aber deine lokalen Änderungen komplett entfernen möchtest, holst du dir den letzten Stand vom entfernten Repository mit folgenden Befehlen:<br>
+ Wenn du aber deine lokalen Änderungen komplett entfernen möchtest, holst du dir den letzten Stand vom
+ entfernten Repository mit folgenden Befehlen:<br>
<code>git fetch origin</code><br>
<code>git reset --hard origin/master</code>
</p>
@@ -223,7 +254,8 @@ <h3>Anleitungen</h3>
</div>
<div class="announcement">
<a href="http://frontify.com/?utm_source=gitguide&utm_campaign=founder">
- <img src="http://d13bhd1byokz0o.cloudfront.net/ad/clarify-announcement-git@2x.png" width="960" height="100" alt="Clarify">
+ <img src="http://d13bhd1byokz0o.cloudfront.net/ad/clarify-announcement-git@2x.png" width="960" height="100"
+ alt="Clarify">
</a>
</div>
<a name="comments"></a>
@@ -233,15 +265,22 @@ <h2>Kommentare</h2>
<script type="text/javascript">
var disqus_shortname = 'git-the-simple-guide';
/* * * DON'T EDIT BELOW THIS LINE * * */
- (function() {
- var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+ (function () {
+ var dsq = document.createElement('script');
+ dsq.type = 'text/javascript';
+ dsq.async = true;
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
- (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(
+ dsq);
})();
</script>
- <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+ <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by
+ Disqus.</a></noscript>
</div>
- <a href="http://www.git-tower.com/?source=rd" onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
- <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;" class="cheatsheet"></a>
+ <a href="http://www.git-tower.com/?source=rd"
+ onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
+ <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;"
+ class="cheatsheet"></a>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/index.es.html b/index.es.html
index d3f78ce9..ec646bac 100644
--- a/index.es.html
+++ b/index.es.html
@@ -1,33 +1,52 @@
<!DOCTYPE html>
<html lang="en">
+
<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title>git - la guía sencilla</title>
- <link href='http://fonts.googleapis.com/css?family=Chelsea+Market' rel='stylesheet' type='text/css'>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <title>git - la guía sencilla</title>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/normalize/0/normalize.min.css" type="text/css">
- <link rel="stylesheet" href="css/style.css" type="text/css">
+ <link rel="stylesheet" href="css/style.css" type="text/css">
<script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-652147-13']);
- _gaq.push(['_trackPageview']);
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-652147-13']);
+ _gaq.push(['_trackPageview']);
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
+ (function () {
+ var ga = document.createElement('script');
+ ga.type = 'text/javascript';
+ ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') +
+ '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(ga, s);
+ })();
</script>
</head>
+
<body>
<div class="scrollblock block-title">
- <h1>git - la guía sencilla</h1>
+ <h1>git - la guía sencilla</h1>
<p>una guía sencilla para comenzar con git. sin complicaciones ;)</p>
- <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>
- <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>
+ <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>
+ <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>
<p class="meta">
- por <a href="http://www.twitter.com/rogerdudler">Roger Dudler</a> (traducido por <a href="http://www.twitter.com/lfbarragan">@lfbarragan</a> y <a href="https://twitter.com/adrimatellanes">@adrimatellanes</a>)
- <br />créditos a <a href="http://www.twitter.com/tfnico">@tfnico</a>, <a href="http://www.twitter.com/fhd">@fhd</a> y <a href="http://www.namics.com">Namics</a><br />
+ por <a href="http://www.twitter.com/rogerdudler">Roger Dudler</a> (traducido por <a
+ href="http://www.twitter.com/lfbarragan">@lfbarragan</a> y <a
+ href="https://twitter.com/adrimatellanes">@adrimatellanes</a>)
+ <br />créditos a <a href="http://www.twitter.com/tfnico">@tfnico</a>, <a
+ href="http://www.twitter.com/fhd">@fhd</a> y <a href="http://www.namics.com">Namics</a><br />
disponible en
<a href="index.html">english</a>,
<a href="index.de.html">deutsch</a>,
@@ -39,13 +58,14 @@ <h1>git - la guía sencilla</h1>
<a href="index.pt_BR.html">português</a>,
<a href="index.ru.html">русский</a>,
<a href="index.tr.html">türkçe</a>,
- <br/>
+ <br />
<a href="index.my.html">မြန်မာ</a>,
<a href="index.ja.html">日本語</a>,
<a href="index.zh.html">中文</a>,
<a href="index.ko.html">한국어</a>
<br />
- por favor, reporta cualquier problema en <a href="https://github.com/rogerdudler/git-guide/issues">github</a>
+ por favor, reporta cualquier problema en <a
+ href="https://github.com/rogerdudler/git-guide/issues">github</a>
</p>
<img src="img/arrow.png" alt="" />
</div>
@@ -60,7 +80,8 @@ <h2>configuración</h2>
<a href="http://msysgit.github.io/">Descarga git para Windows</a>
</p>
<p>
- <a href="http://git-scm.com/book/es/v1/Empezando-Instalando-Git#Instalando-en-Linux">Descarga git para Linux</a>
+ <a href="http://git-scm.com/book/es/v1/Empezando-Instalando-Git#Instalando-en-Linux">Descarga git para
+ Linux</a>
</p>
</div>
<a name="create"></a>
@@ -109,11 +130,13 @@ <h2>add & commit</h2>
<div class="scrollblock block-remote">
<h2>envío de cambios</h2>
<p>
- Tus cambios están ahora en el <b>HEAD</b> de tu copia local. Para enviar estos cambios a tu repositorio remoto ejecuta <br />
+ Tus cambios están ahora en el <b>HEAD</b> de tu copia local. Para enviar estos cambios a tu repositorio
+ remoto ejecuta <br />
<code>git push origin master</code><br />
Reemplaza <i>master</i> por la rama a la que quieres enviar tus cambios.
<br /><br />
- Si no has clonado un repositorio ya existente y quieres conectar tu repositorio local a un repositorio remoto, usa<br />
+ Si no has clonado un repositorio ya existente y quieres conectar tu repositorio local a un repositorio
+ remoto, usa<br />
<code>git remote add origin <server></code><br />
Ahora podrás subir tus cambios al repositorio remoto seleccionado.<br />
@@ -123,7 +146,9 @@ <h2>envío de cambios</h2>
<div class="scrollblock block-branching">
<h2>ramas</h2>
<p>
- Las ramas son utilizadas para desarrollar funcionalidades aisladas unas de otras. La rama <i>master</i> es la rama "por defecto" cuando creas un repositorio. Crea nuevas ramas durante el desarrollo y fusiónalas a la rama principal cuando termines.
+ Las ramas son utilizadas para desarrollar funcionalidades aisladas unas de otras. La rama <i>master</i> es
+ la rama "por defecto" cuando creas un repositorio. Crea nuevas ramas durante el desarrollo y fusiónalas a la
+ rama principal cuando termines.
</p>
<img src="img/branches.png" alt="" />
<p>
@@ -133,7 +158,8 @@ <h2>ramas</h2>
<code>git checkout master</code><br />
y borra la rama<br />
<code>git branch -d feature_x</code><br />
- Una rama nueva <i>no estará disponible para los demás</i> a menos que subas (push) la rama a tu repositorio remoto<br />
+ Una rama nueva <i>no estará disponible para los demás</i> a menos que subas (push) la rama a tu repositorio
+ remoto<br />
<code>git push origin <branch></code>
</p>
</div>
@@ -146,9 +172,11 @@ <h2>actualiza & fusiona</h2>
en tu directorio de trabajo para <i>bajar</i> y <i>fusionar</i> los cambios remotos.<br />
Para fusionar otra rama a tu rama activa (por ejemplo master), utiliza<br />
<code>git merge <branch></code><br />
- en ambos casos git intentará fusionar automáticamente los cambios. Desafortunadamente, no siempre será posible y se podrán producir <i>conflictos</i>.
+ en ambos casos git intentará fusionar automáticamente los cambios. Desafortunadamente, no siempre será
+ posible y se podrán producir <i>conflictos</i>.
Tú eres responsable de fusionar esos <i>conflictos</i>
- manualmente al editar los archivos mostrados por git. Después de modificarlos, necesitas marcarlos como fusionados con<br />
+ manualmente al editar los archivos mostrados por git. Después de modificarlos, necesitas marcarlos como
+ fusionados con<br />
<code>git add <filename></code><br />
Antes de fusionar los cambios, puedes revisarlos usando<br />
<code>git diff <source_branch> <target_branch></code>
@@ -158,9 +186,11 @@ <h2>actualiza & fusiona</h2>
<div class="scrollblock block-tagging">
<h2>etiquetas</h2>
<p>
- Se recomienda crear etiquetas para cada nueva versión publicada de un software. Este concepto no es nuevo, ya que estaba disponible en SVN. Puedes crear una nueva etiqueta llamada <i>1.0.0</i> ejecutando<br />
+ Se recomienda crear etiquetas para cada nueva versión publicada de un software. Este concepto no es nuevo,
+ ya que estaba disponible en SVN. Puedes crear una nueva etiqueta llamada <i>1.0.0</i> ejecutando<br />
<code>git tag 1.0.0 1b2e1d63ff</code><br />
- <i>1b2e1d63ff</i> se refiere a los 10 caracteres del commit id al cual quieres referirte con tu etiqueta. Puedes obtener el commit id con <br />
+ <i>1b2e1d63ff</i> se refiere a los 10 caracteres del commit id al cual quieres referirte con tu etiqueta.
+ Puedes obtener el commit id con <br />
<code>git log</code><br />
también puedes usar menos caracteres que el commit id, pero debe ser un valor único.
</p>
@@ -169,13 +199,16 @@ <h2>etiquetas</h2>
<div class="scrollblock block-checkout-replace">
<h2>reemplaza cambios locales</h2>
<p>
- En caso de que hagas algo mal (lo que seguramente nunca suceda ;) puedes reemplazar cambios locales usando el comando<br />
+ En caso de que hagas algo mal (lo que seguramente nunca suceda ;) puedes reemplazar cambios locales usando
+ el comando<br />
<code>git checkout -- <filename></code><br />
- Este comando reemplaza los cambios en tu directorio de trabajo con el último contenido de HEAD. Los cambios que ya han sido agregados al Index, así como también
- los nuevos archivos, se mantendrán sin cambio.
+ Este comando reemplaza los cambios en tu directorio de trabajo con el último contenido de HEAD. Los cambios
+ que ya han sido agregados al Index, así como también
+ los nuevos archivos, se mantendrán sin cambio.
</p>
<p>
- Por otro lado, si quieres deshacer todos los cambios locales y commits, puedes traer la última versión del servidor y apuntar a tu copia local principal de esta forma<br />
+ Por otro lado, si quieres deshacer todos los cambios locales y commits, puedes traer la última versión del
+ servidor y apuntar a tu copia local principal de esta forma<br />
<code>git fetch origin</code><br />
<code>git reset --hard origin/master</code>
</p>
@@ -220,7 +253,8 @@ <h3>guías</h3>
</div>
<div class="announcement">
<a href="http://frontify.com/?utm_source=gitguide&utm_campaign=founder">
- <img src="http://d13bhd1byokz0o.cloudfront.net/ad/clarify-announcement-git@2x.png" width="960" height="100" alt="Clarify" />
+ <img src="http://d13bhd1byokz0o.cloudfront.net/ad/clarify-announcement-git@2x.png" width="960" height="100"
+ alt="Clarify" />
</a>
</div>
<a name="comments"></a>
@@ -232,15 +266,22 @@ <h2>comentarios</h2>
var disqus_shortname = 'git-the-simple-guide'; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */
- (function() {
- var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+ (function () {
+ var dsq = document.createElement('script');
+ dsq.type = 'text/javascript';
+ dsq.async = true;
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
- (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(
+ dsq);
})();
</script>
- <noscript>Por favor habilita Javascript para ver los <a href="http://disqus.com/?ref_noscript">comentarios - powered by Disqus.</a></noscript>
+ <noscript>Por favor habilita Javascript para ver los <a href="http://disqus.com/?ref_noscript">comentarios -
+ powered by Disqus.</a></noscript>
</div>
- <a href="http://www.git-tower.com/?source=rd" onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
- <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;" class="cheatsheet"></a>
+ <a href="http://www.git-tower.com/?source=rd"
+ onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
+ <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;"
+ class="cheatsheet"></a>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/index.fr.html b/index.fr.html
index 975c48d8..966cf522 100644
--- a/index.fr.html
+++ b/index.fr.html
@@ -1,228 +1,257 @@
<!DOCTYPE html>
<html lang="fr">
- <head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title>git - petit guide - no deep shit!</title>
- <link href='http://fonts.googleapis.com/css?family=Chelsea+Market' rel='stylesheet' type='text/css'>
- <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/normalize/0/normalize.min.css" type="text/css">
- <link rel="stylesheet" href="css/style.css" type="text/css">
- <script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-652147-13']);
- _gaq.push(['_trackPageview']);
- (function() {
- var ga = document.createElement('script');
- ga.type = 'text/javascript';
- ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0];
- s.parentNode.insertBefore(ga, s);
- })();
- function recordOutboundLink(link, category, action) {
- _gat._getTrackerByName()._trackEvent(category, action);
- setTimeout('document.location = "' + link.href + '"', 100);
- }
+<head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <title>git - petit guide - no deep shit!</title>
+ <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/normalize/0/normalize.min.css" type="text/css">
+ <link rel="stylesheet" href="css/style.css" type="text/css">
+ <script type="text/javascript">
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-652147-13']);
+ _gaq.push(['_trackPageview']);
+
+ (function () {
+ var ga = document.createElement('script');
+ ga.type = 'text/javascript';
+ ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') +
+ '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(ga, s);
+ })();
+
+ function recordOutboundLink(link, category, action) {
+ _gat._getTrackerByName()._trackEvent(category, action);
+ setTimeout('document.location = "' + link.href + '"', 100);
+ }
+ </script>
+</head>
+
+<body>
+ <div class="scrollblock block-title">
+ <h1>git - petit guide</h1>
+ <p>juste un petit guide pour bien démarrer avec git.
+ <!-- UNTRANSLATED -->no deep shit ;)</p>
+ <a href="https://twitter.com/share" class="twitter-share-button"
+ data-url="http://rogerdudler.github.com/git-guide" data-via="rogerdudler" data-size="large"
+ data-related="rogerdudler" data-hashtags="git">Tweet</a>
+ <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>
- </head>
- <body>
- <div class="scrollblock block-title">
- <h1>git - petit guide</h1>
- <p>juste un petit guide pour bien démarrer avec git. <!-- UNTRANSLATED -->no deep shit ;)</p>
- <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://rogerdudler.github.com/git-guide" data-via="rogerdudler" data-size="large" data-related="rogerdudler" data-hashtags="git">Tweet</a>
- <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>
- <p class="meta">
- par <a href="http://www.twitter.com/rogerdudler">Roger Dudler</a> (translation by <a href="https://github.com/KokaKiwi">KokaKiwi</a>)
- <br />Remerciements à <a href="http://www.twitter.com/tfnico">@tfnico</a>, <a href="http://www.twitter.com/fhd">@fhd</a>, <a href="http://www.namics.com">Namics</a><br />
- this guide in
- <a href="index.html">english</a>,
- <a href="index.de.html">deutsch</a>,
- <a href="index.es.html">español</a>,
- <a href="index.id.html">indonesian</a>,
- <a href="index.it.html">italiano</a>,
- <a href="index.nl.html">nederlands</a>,
- <a href="index.pl.html">polski</a>,
- <a href="index.pt_BR.html">português</a>,
- <a href="index.ru.html">русский</a>,
- <a href="index.tr.html">türkçe</a>,
- <br/>
- <a href="index.my.html">မြန်မာ</a>,
- <a href="index.ja.html">日本語</a>,
- <a href="index.zh.html">中文</a>,
- <a href="index.ko.html">한국어</a>
- <br />
- </p>
- <img src="img/arrow.png" alt="" />
- </div>
- <!-- setup -->
- <a name="setup"></a>
- <div class="scrollblock block-setup">
- <h2>installation</h2>
- <p>
- <a href="http://git-scm.com/download/mac">Télécharger git pour Mac OSX</a>
- </p>
- <p>
- <a href="http://msysgit.github.io/">Télécharger git pour Windows</a>
- </p>
- <p>
- <a href="http://book.git-scm.com/2_installing_git.html">Télécharger git pour Linux</a>
- </p>
- </div>
- <a name="create"></a>
- <div class="scrollblock block-create">
- <h2>créer un nouveau dépôt</h2>
- <p>
- créez un nouveau dossier, ouvrez le et exécutez la commande<br />
- <code>git init</code><br />
- pour créer un nouveau dépôt.
- </p>
- </div>
- <a name="checkout"></a>
- <div class="scrollblock block-checkout">
- <h2>cloner un dépôt</h2>
- <p>
- créez une copie de votre dépôt local en exécutant la commande<br />
- <code>git clone /path/to/repository</code><br />
- si vous utilisez un serveur distant, cette commande sera<br />
- <code>git clone username@host:/path/to/repository</code>
- </p>
- </div>
- <a name="trees"></a>
- <div class="scrollblock block-trees">
- <h2>arbres</h2>
- <p>
- votre dépôt local est composé de trois "arbres" gérés par git.
- le premier est votre <code>espace de travail</code> qui contient réellement vos fichiers.
- le second est un <code>Index</code> qui joue un rôle d'espace de transit pour vos fichiers et
- enfin <code>HEAD</code> qui pointe vers la dernière validation que vous ayez faite.
- </p>
- <img src="img/trees.png" alt="" />
- </div>
- <a name="add"></a>
- <div class="scrollblock block-add">
- <h2>ajouter & valider</h2>
- <p>
- Vous pouvez proposer un changement (l'ajouter à l'<b>Index</b>) en exécutant les commandes<br />
- <code>git add <filename></code><br />
- <code>git add *</code><br />
- C'est la première étape dans un workflow git basique. Pour valider ces changements, utilisez<br />
- <code>git commit -m "Message de validation"</code><br />
- Le fichier est donc ajouté au <b>HEAD</b>, mais pas encore dans votre dépôt distant.
- </p>
- </div>
- <a name="push"></a>
- <div class="scrollblock block-remote">
- <h2>envoyer des changements</h2>
- <p>
- Vos changements sont maintenant dans le <b>HEAD</b> de la copie de votre dépôt local. Pour les envoyer à votre dépôt distant, exécutez la commande<br />
- <code>git push origin master</code><br />
- Remplacez <i>master</i> par la branche dans laquelle vous souhaitez envoyer vos changements.
- <br /><br />
- Si vous n'avez pas cloné votre dépôt existant et voulez le connecter à votre dépôt sur un serveur distant, vous devez l'ajouter avec<br />
- <code>git remote add origin <server></code><br />
- Maintenant, vous pouvez envoyer vos changements vers le serveur distant sélectionné<br />
+ <p class="meta">
+ par <a href="http://www.twitter.com/rogerdudler">Roger Dudler</a> (translation by <a
+ href="https://github.com/KokaKiwi">KokaKiwi</a>)
+ <br />Remerciements à <a href="http://www.twitter.com/tfnico">@tfnico</a>, <a
+ href="http://www.twitter.com/fhd">@fhd</a>, <a href="http://www.namics.com">Namics</a><br />
+ this guide in
+ <a href="index.html">english</a>,
+ <a href="index.de.html">deutsch</a>,
+ <a href="index.es.html">español</a>,
+ <a href="index.id.html">indonesian</a>,
+ <a href="index.it.html">italiano</a>,
+ <a href="index.nl.html">nederlands</a>,
+ <a href="index.pl.html">polski</a>,
+ <a href="index.pt_BR.html">português</a>,
+ <a href="index.ru.html">русский</a>,
+ <a href="index.tr.html">türkçe</a>,
+ <br />
+ <a href="index.my.html">မြန်မာ</a>,
+ <a href="index.ja.html">日本語</a>,
+ <a href="index.zh.html">中文</a>,
+ <a href="index.ko.html">한국어</a>
+ <br />
+ </p>
+ <img src="img/arrow.png" alt="" />
+ </div>
+ <!-- setup -->
+ <a name="setup"></a>
+ <div class="scrollblock block-setup">
+ <h2>installation</h2>
+ <p>
+ <a href="http://git-scm.com/download/mac">Télécharger git pour Mac OSX</a>
+ </p>
+ <p>
+ <a href="http://msysgit.github.io/">Télécharger git pour Windows</a>
+ </p>
+ <p>
+ <a href="http://book.git-scm.com/2_installing_git.html">Télécharger git pour Linux</a>
+ </p>
+ </div>
+ <a name="create"></a>
+ <div class="scrollblock block-create">
+ <h2>créer un nouveau dépôt</h2>
+ <p>
+ créez un nouveau dossier, ouvrez le et exécutez la commande<br />
+ <code>git init</code><br />
+ pour créer un nouveau dépôt.
+ </p>
+ </div>
+ <a name="checkout"></a>
+ <div class="scrollblock block-checkout">
+ <h2>cloner un dépôt</h2>
+ <p>
+ créez une copie de votre dépôt local en exécutant la commande<br />
+ <code>git clone /path/to/repository</code><br />
+ si vous utilisez un serveur distant, cette commande sera<br />
+ <code>git clone username@host:/path/to/repository</code>
+ </p>
+ </div>
+ <a name="trees"></a>
+ <div class="scrollblock block-trees">
+ <h2>arbres</h2>
+ <p>
+ votre dépôt local est composé de trois "arbres" gérés par git.
+ le premier est votre <code>espace de travail</code> qui contient réellement vos fichiers.
+ le second est un <code>Index</code> qui joue un rôle d'espace de transit pour vos fichiers et
+ enfin <code>HEAD</code> qui pointe vers la dernière validation que vous ayez faite.
+ </p>
+ <img src="img/trees.png" alt="" />
+ </div>
+ <a name="add"></a>
+ <div class="scrollblock block-add">
+ <h2>ajouter & valider</h2>
+ <p>
+ Vous pouvez proposer un changement (l'ajouter à l'<b>Index</b>) en exécutant les
+ commandes<br />
+ <code>git add <filename></code><br />
+ <code>git add *</code><br />
+ C'est la première étape dans un workflow git basique. Pour valider ces changements,
+ utilisez<br />
+ <code>git commit -m "Message de validation"</code><br />
+ Le fichier est donc ajouté au <b>HEAD</b>, mais pas encore dans votre dépôt distant.
+ </p>
+ </div>
+ <a name="push"></a>
+ <div class="scrollblock block-remote">
+ <h2>envoyer des changements</h2>
+ <p>
+ Vos changements sont maintenant dans le <b>HEAD</b> de la copie de votre dépôt local. Pour les
+ envoyer à votre dépôt distant, exécutez la commande<br />
+ <code>git push origin master</code><br />
+ Remplacez <i>master</i> par la branche dans laquelle vous souhaitez envoyer vos changements.
+ <br /><br />
+ Si vous n'avez pas cloné votre dépôt existant et voulez le connecter à votre
+ dépôt sur un serveur distant, vous devez l'ajouter avec<br />
+ <code>git remote add origin <server></code><br />
+ Maintenant, vous pouvez envoyer vos changements vers le serveur distant sélectionné<br />
- </p>
- </div>
- <a name="branching"></a>
- <div class="scrollblock block-branching">
- <h2>branches</h2>
- <p>
- Les branches sont utilisées pour développer des fonctionnalités isolées des autres.
- La branche <i>master</i> est la branche par défaut quand vous créez un dépôt.
- Utilisez les autres branches pour le développement et fusionnez ensuite à la branche principale quand vous avez fini.
- </p>
- <img src="img/branches.png" alt="" />
- <p>
- créer une nouvelle branche nommée "feature_x" et <!-- BAD TRANSLATE -->passer dessus pour l'utiliser<br />
- <code>git checkout -b feature_x</code><br />
- retourner sur la branche principale<br />
- <code>git checkout master</code><br />
- et supprimer la branche<br />
- <code>git branch -d feature_x</code><br />
- une branche n'est <i>pas disponible pour les autres</i> tant que vous ne l'aurez pas envoyée vers votre dépôt distant<br />
- <code>git push origin <branch></code>
- </p>
- </div>
- <a name="update"></a>
- <div class="scrollblock block-merging">
- <h2>mettre à jour & fusionner</h2>
- <p>
- pour mettre à jour votre dépôt local vers les dernières validations, exécutez la commande<br />
- <code>git pull</code><br />
- dans votre espace de travail pour <i>récupérer</i> et <i>fusionner</i> les changements distants.<br />
- pour fusionner une autre branche avec la branche active (par exemple master), utilisez<br />
- <code>git merge <branch></code><br />
- dans les deux cas, git tente d'auto-fusionner les changements. Malheureusement, ça n'est pas toujours possible et résulte par des <i>conflits</i>.
- Vous devez alors régler ces <i>conflits</i>
- manuellement en éditant les fichiers indiqués par git. Après l'avoir fait, vous devez les marquer comme fusionnés avec<br />
- <code>git add <filename></code><br />
- après avoir fusionné les changements, vous pouvez en avoir un aperçu en utilisant<br />
- <code>git diff <source_branch> <target_branch></code>
- </p>
- </div>
- <a name="tagging"></a>
- <div class="scrollblock block-tagging">
- <h2>tags</h2>
- <p>
- il est recommandé de créer des tags pour les releases de programmes. c'est un concept connu, qui existe aussi dans SVN. Vous pouvez créer un tag nommé <i>1.0.0</i> en exécutant la commande<br />
- <code>git tag 1.0.0 1b2e1d63ff</code><br />
- le <i>1b2e1d63ff</i> désigne les 10 premiers caractères de l'identifiant du changement que vous voulez référencer avec ce tag. Vous pouvez obtenir cet identifiant avec <br />
- <code>git log</code><br />
- vous pouvez utiliser moins de caractères de cet identifiant, il doit juste rester unique.
- </p>
- </div>
- <a name="checkout-replace"></a>
- <div class="scrollblock block-checkout-replace">
- <h2>remplacer les changements locaux</h2>
- <p>
- Dans le cas où vous auriez fait quelque chose de travers (ce qui bien entendu n'arrive jamais ;) vous pouvez annuler les changements locaux en utilisant cette commande<br />
- <code>git checkout -- <filename></code><br />
- cela remplacera les changements dans votre arbre de travail avec le dernier contenu du HEAD. Les changements déjà ajoutés à l'index, aussi bien les nouveaux fichiers, seront gardés.
- </p>
- <p>
- Si à la place vous voulez supprimer tous les changements et validations locaux, récupérez le dernier historique depuis le serveur et pointez la branche principale locale dessus comme ceci<br />
- <code>git fetch origin</code><br />
- <code>git reset --hard origin/master</code>
- </p>
- </div>
- <a name="hints"></a>
- <div class="scrollblock block-hints">
- <h2>conseils utiles</h2>
- <p>
- Interface git incluse<br />
- <code>gitk</code><br />
- utiliser des couleurs dans la sortie de git<br />
- <code>git config color.ui true</code><br />
- afficher le journal sur une seule ligne pour chaque validation<br />
- <code>git config format.pretty oneline</code><br />
- utiliser l'ajout interactif<br />
- <code>git add -i</code>
- </p>
- </div>
- <a name="resources"></a>
- <div class="scrollblock block-resources">
- <h2>liens et ressources</h2>
- <h3>clients graphiques</h3>
- <p>
- <ul>
- <li><a href="http://gitx.laullon.com/">GitX (L) (OSX, open source)</a></li>
- <li><a href="http://www.git-tower.com/">Tower (OSX)</a></li>
- <li><a href="http://www.sourcetreeapp.com/">Source Tree (OSX, free)</a></li>
- <li><a href="http://mac.github.com/">GitHub for Mac (OSX, free)</a></li>
- <li><a href="https://itunes.apple.com/gb/app/gitbox/id403388357?mt=12">GitBox (OSX)</a></li>
- <li><a href="https://code.google.com/p/gitextensions/">Git Extensions (WIN, open source)</a></li>
- </ul>
- </p>
+ </p>
+ </div>
+ <a name="branching"></a>
+ <div class="scrollblock block-branching">
+ <h2>branches</h2>
+ <p>
+ Les branches sont utilisées pour développer des fonctionnalités isolées des
+ autres.
+ La branche <i>master</i> est la branche par défaut quand vous créez un dépôt.
+ Utilisez les autres branches pour le développement et fusionnez ensuite à la branche
+ principale quand vous avez fini.
+ </p>
+ <img src="img/branches.png" alt="" />
+ <p>
+ créer une nouvelle branche nommée "feature_x" et
+ <!-- BAD TRANSLATE -->passer dessus pour l'utiliser<br />
+ <code>git checkout -b feature_x</code><br />
+ retourner sur la branche principale<br />
+ <code>git checkout master</code><br />
+ et supprimer la branche<br />
+ <code>git branch -d feature_x</code><br />
+ une branche n'est <i>pas disponible pour les autres</i> tant que vous ne l'aurez pas envoyée vers
+ votre dépôt distant<br />
+ <code>git push origin <branch></code>
+ </p>
+ </div>
+ <a name="update"></a>
+ <div class="scrollblock block-merging">
+ <h2>mettre à jour & fusionner</h2>
+ <p>
+ pour mettre à jour votre dépôt local vers les dernières validations,
+ exécutez la commande<br />
+ <code>git pull</code><br />
+ dans votre espace de travail pour <i>récupérer</i> et <i>fusionner</i> les changements
+ distants.<br />
+ pour fusionner une autre branche avec la branche active (par exemple master), utilisez<br />
+ <code>git merge <branch></code><br />
+ dans les deux cas, git tente d'auto-fusionner les changements. Malheureusement, ça n'est pas toujours
+ possible et résulte par des <i>conflits</i>.
+ Vous devez alors régler ces <i>conflits</i>
+ manuellement en éditant les fichiers indiqués par git. Après l'avoir fait, vous devez
+ les marquer comme fusionnés avec<br />
+ <code>git add <filename></code><br />
+ après avoir fusionné les changements, vous pouvez en avoir un aperçu en utilisant<br />
+ <code>git diff <source_branch> <target_branch></code>
+ </p>
+ </div>
+ <a name="tagging"></a>
+ <div class="scrollblock block-tagging">
+ <h2>tags</h2>
+ <p>
+ il est recommandé de créer des tags pour les releases de programmes. c'est un concept connu,
+ qui existe aussi dans SVN. Vous pouvez créer un tag nommé <i>1.0.0</i> en exécutant la
+ commande<br />
+ <code>git tag 1.0.0 1b2e1d63ff</code><br />
+ le <i>1b2e1d63ff</i> désigne les 10 premiers caractères de l'identifiant du changement que
+ vous voulez référencer avec ce tag. Vous pouvez obtenir cet identifiant avec <br />
+ <code>git log</code><br />
+ vous pouvez utiliser moins de caractères de cet identifiant, il doit juste rester unique.
+ </p>
+ </div>
+ <a name="checkout-replace"></a>
+ <div class="scrollblock block-checkout-replace">
+ <h2>remplacer les changements locaux</h2>
+ <p>
+ Dans le cas où vous auriez fait quelque chose de travers (ce qui bien entendu n'arrive jamais ;) vous
+ pouvez annuler les changements locaux en utilisant cette commande<br />
+ <code>git checkout -- <filename></code><br />
+ cela remplacera les changements dans votre arbre de travail avec le dernier contenu du HEAD. Les changements
+ déjà ajoutés à l'index, aussi bien les nouveaux fichiers, seront gardés.
+ </p>
+ <p>
+ Si à la place vous voulez supprimer tous les changements et validations locaux,
+ récupérez le dernier historique depuis le serveur et pointez la branche principale locale
+ dessus comme ceci<br />
+ <code>git fetch origin</code><br />
+ <code>git reset --hard origin/master</code>
+ </p>
+ </div>
+ <a name="hints"></a>
+ <div class="scrollblock block-hints">
+ <h2>conseils utiles</h2>
+ <p>
+ Interface git incluse<br />
+ <code>gitk</code><br />
+ utiliser des couleurs dans la sortie de git<br />
+ <code>git config color.ui true</code><br />
+ afficher le journal sur une seule ligne pour chaque validation<br />
+ <code>git config format.pretty oneline</code><br />
+ utiliser l'ajout interactif<br />
+ <code>git add -i</code>
+ </p>
+ </div>
+ <a name="resources"></a>
+ <div class="scrollblock block-resources">
+ <h2>liens et ressources</h2>
+ <h3>clients graphiques</h3>
+ <p>
+ <ul>
+ <li><a href="http://gitx.laullon.com/">GitX (L) (OSX, open source)</a></li>
+ <li><a href="http://www.git-tower.com/">Tower (OSX)</a></li>
+ <li><a href="http://www.sourcetreeapp.com/">Source Tree (OSX, free)</a></li>
+ <li><a href="http://mac.github.com/">GitHub for Mac (OSX, free)</a></li>
+ <li><a href="https://itunes.apple.com/gb/app/gitbox/id403388357?mt=12">GitBox (OSX)</a></li>
+ <li><a href="https://code.google.com/p/gitextensions/">Git Extensions (WIN, open source)</a></li>
+ </ul>
+ </p>
<h3>guides</h3>
<p>
<ul>
@@ -233,32 +262,38 @@ <h3>guides</h3>
<li><a href="http://marklodato.github.com/visual-git-guide/index-en.html">A Visual Git Guide</a></li>
</ul>
</p>
-</div>
-<div class="announcement">
- <a href="http://frontify.com/?utm_source=gitguide&utm_campaign=founder">
- <img src="http://d13bhd1byokz0o.cloudfront.net/ad/clarify-announcement-git@2x.png" width="960" height="100" alt="Clarify" />
- </a>
-</div>
-<a name="comments"></a>
-<div class="scrollblock block-comments">
- <h2>commentaires</h2>
- <div id="disqus_thread"></div>
- <script type="text/javascript">
- /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
- var disqus_shortname = 'git-the-simple-guide'; // required: replace example with your forum shortname
+ </div>
+ <div class="announcement">
+ <a href="http://frontify.com/?utm_source=gitguide&utm_campaign=founder">
+ <img src="http://d13bhd1byokz0o.cloudfront.net/ad/clarify-announcement-git@2x.png" width="960" height="100"
+ alt="Clarify" />
+ </a>
+ </div>
+ <a name="comments"></a>
+ <div class="scrollblock block-comments">
+ <h2>commentaires</h2>
+ <div id="disqus_thread"></div>
+ <script type="text/javascript">
+ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
+ var disqus_shortname = 'git-the-simple-guide'; // required: replace example with your forum shortname
- /* * * DON'T EDIT BELOW THIS LINE * * */
- (function() {
- var dsq = document.createElement('script');
- dsq.type = 'text/javascript';
- dsq.async = true;
- dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
- (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
- })();
- </script>
- <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
-</div>
-<a href="http://www.git-tower.com/?source=rd" onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com'); return false;" class="tower"></a>
-<a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide'); return false;" class="cheatsheet"></a>
+ /* * * DON'T EDIT BELOW THIS LINE * * */
+ (function () {
+ var dsq = document.createElement('script');
+ dsq.type = 'text/javascript';
+ dsq.async = true;
+ dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(
+ dsq);
+ })();
+ </script>
+ <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by
+ Disqus.</a></noscript>
+ </div>
+ <a href="http://www.git-tower.com/?source=rd"
+ onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com'); return false;" class="tower"></a>
+ <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide'); return false;"
+ class="cheatsheet"></a>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/index.html b/index.html
index 5a2f2db1..e2b126d9 100644
--- a/index.html
+++ b/index.html
@@ -1,38 +1,55 @@
<!DOCTYPE html>
<html lang="en">
+
<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title>git - the simple guide - no deep shit!</title>
- <link href='http://fonts.googleapis.com/css?family=Chelsea+Market' rel='stylesheet' type='text/css'>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <title>git - the simple guide - no deep shit!</title>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/normalize/0/normalize.min.css" type="text/css">
- <link rel="stylesheet" href="css/style.css" type="text/css">
+ <link rel="stylesheet" href="css/style.css" type="text/css">
<script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-652147-13']);
- _gaq.push(['_trackPageview']);
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-652147-13']);
+ _gaq.push(['_trackPageview']);
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
+ (function () {
+ var ga = document.createElement('script');
+ ga.type = 'text/javascript';
+ ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') +
+ '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(ga, s);
+ })();
- function recordOutboundLink(link, category, action) {
- _gat._getTrackerByName()._trackEvent(category, action);
- setTimeout('document.location = "' + link.href + '"', 100);
- }
+ function recordOutboundLink(link, category, action) {
+ _gat._getTrackerByName()._trackEvent(category, action);
+ setTimeout('document.location = "' + link.href + '"', 100);
+ }
</script>
</head>
+
<body>
<div class="scrollblock block-title">
<h1>git - the simple guide</h1>
<p>just a simple guide for getting started with git. no deep shit ;)</p>
- <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>
- <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>
+ <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>
+ <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>
<p class="meta">
by <a href="http://www.twitter.com/rogerdudler">Roger Dudler</a>
- <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 />
+ <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 />
this guide in
<a href="index.de.html">deutsch</a>,
<a href="index.es.html">español</a>,
@@ -44,7 +61,7 @@ <h1>git - the simple guide</h1>
<a href="index.pt_BR.html">português</a>,
<a href="index.ru.html">русский</a>,
<a href="index.tr.html">türkçe</a>,
- <br/>
+ <br />
<a href="index.my.html">မြန်မာ</a>,
<a href="index.ja.html">日本語</a>,
<a href="index.zh.html">中文</a>,
@@ -53,7 +70,9 @@ <h1>git - the simple guide</h1>
<br />
please report issues on <a href="https://github.com/rogerdudler/git-guide/issues">github</a>
</p>
- <script async type="text/javascript" src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=gitguide" id="_carbonads_js"></script>
+ <script async type="text/javascript"
+ src="//cdn.carbonads.com/carbon.js?zoneid=1673&serve=C6AILKT&placement=gitguide" id="_carbonads_js">
+ </script>
<img src="img/arrow.png" alt="" />
</div>
<!-- setup -->
@@ -116,11 +135,13 @@ <h2>add & commit</h2>
<div class="scrollblock block-remote">
<h2>pushing changes</h2>
<p>
- Your changes are now in the <b>HEAD</b> of your local working copy. To send those changes to your remote repository, execute <br />
+ Your changes are now in the <b>HEAD</b> of your local working copy. To send those changes to your remote
+ repository, execute <br />
<code>git push origin master</code><br />
Change <i>master</i> to whatever branch you want to push your changes to.
<br /><br />
- 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 />
+ 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 />
<code>git remote add origin <server></code><br />
Now you are able to push your changes to the selected remote server<br />
@@ -130,7 +151,9 @@ <h2>pushing changes</h2>
<div class="scrollblock block-branching">
<h2>branching</h2>
<p>
- 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.
+ 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.
</p>
<img src="img/branches.png" alt="" />
<p>
@@ -153,7 +176,8 @@ <h2>update & merge</h2>
in your working directory to <i>fetch</i> and <i>merge</i> remote changes.<br />
to merge another branch into your active branch (e.g. master), use<br />
<code>git merge <branch></code><br />
- in both cases git tries to auto-merge changes. Unfortunately, this is not always possible and results in <i>conflicts</i>.
+ in both cases git tries to auto-merge changes. Unfortunately, this is not always possible and results in
+ <i>conflicts</i>.
You are responsible to merge those <i>conflicts</i>
manually by editing the files shown by git. After changing, you need to mark them as merged with<br />
<code>git add <filename></code><br />
@@ -165,9 +189,11 @@ <h2>update & merge</h2>
<div class="scrollblock block-tagging">
<h2>tagging</h2>
<p>
- 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 />
+ 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 />
<code>git tag 1.0.0 1b2e1d63ff</code><br />
- 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 />
+ 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 />
</p>
</div>
<a name="log"></a>
@@ -176,11 +202,13 @@ <h2>log</h2>
<p>
in its simplest form, you can study repository history using..
<code>git log</code><br />
- 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 />
+ 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 />
<code>git log --author=bob</code><br />
To see a very compressed log where each commit is one line:<br />
<code>git log --pretty=oneline</code><br />
- Or maybe you want to see an ASCII art tree of all the branches, decorated with the names of tags and branches: <br />
+ Or maybe you want to see an ASCII art tree of all the branches, decorated with the names of tags and
+ branches: <br />
<code>git log --graph --oneline --decorate --all</code><br />
See only which files have changed: <br />
<code>git log --name-status</code><br />
@@ -192,12 +220,15 @@ <h2>log</h2>
<div class="scrollblock block-checkout-replace">
<h2>replace local changes</h2>
<p>
- In case you did something wrong, which for sure never happens ;), you can replace local changes using the command<br />
+ In case you did something wrong, which for sure never happens ;), you can replace local changes using the
+ command<br />
<code>git checkout -- <filename></code><br />
- 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.
+ 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.
</p>
<p>
- 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 />
+ 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 />
<code>git fetch origin</code><br />
<code>git reset --hard origin/master</code>
</p>
@@ -256,15 +287,22 @@ <h2>comments</h2>
var disqus_shortname = 'git-the-simple-guide'; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */
- (function() {
- var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+ (function () {
+ var dsq = document.createElement('script');
+ dsq.type = 'text/javascript';
+ dsq.async = true;
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
- (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(
+ dsq);
})();
</script>
- <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+ <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by
+ Disqus.</a></noscript>
</div>
- <a href="http://www.git-tower.com/?source=rd" onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
- <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;" class="cheatsheet"></a>
+ <a href="http://www.git-tower.com/?source=rd"
+ onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
+ <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;"
+ class="cheatsheet"></a>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/index.id.html b/index.id.html
index 5ed57bc1..debf7ed4 100644
--- a/index.id.html
+++ b/index.id.html
@@ -1,38 +1,56 @@
<!DOCTYPE html>
<html lang="id">
+
<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title>git - panduan ringkas - gak pake ribet!</title>
- <link href='http://fonts.googleapis.com/css?family=Chelsea+Market' rel='stylesheet' type='text/css'>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <title>git - panduan ringkas - gak pake ribet!</title>
<link rel="stylesheet" href="css/normalize.css" type="text/css">
- <link rel="stylesheet" href="css/style.css" type="text/css">
+ <link rel="stylesheet" href="css/style.css" type="text/css">
<script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-652147-13']);
- _gaq.push(['_trackPageview']);
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-652147-13']);
+ _gaq.push(['_trackPageview']);
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
+ (function () {
+ var ga = document.createElement('script');
+ ga.type = 'text/javascript';
+ ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') +
+ '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(ga, s);
+ })();
- function recordOutboundLink(link, category, action) {
- _gat._getTrackerByName()._trackEvent(category, action);
- setTimeout('document.location = "' + link.href + '"', 100);
- }
+ function recordOutboundLink(link, category, action) {
+ _gat._getTrackerByName()._trackEvent(category, action);
+ setTimeout('document.location = "' + link.href + '"', 100);
+ }
</script>
</head>
+
<body>
<div class="scrollblock block-title">
<h1>git - panduan ringkas</h1>
<p>sekedar panduan ringkas penggunaan git. gak pake ribet ;)</p>
- <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>
- <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>
+ <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>
+ <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>
<p class="meta">
- oleh <a href="http://www.twitter.com/rogerdudler">Roger Dudler</a> (alih bahasa <a href="//twitter.com/ItangSanjana">Itang Sanjana</a>)
- <br />kredit <a href="http://www.twitter.com/tfnico">@tfnico</a>, <a href="http://www.twitter.com/fhd">@fhd</a> dan <a href="http://www.namics.com">Namics</a><br />
+ oleh <a href="http://www.twitter.com/rogerdudler">Roger Dudler</a> (alih bahasa <a
+ href="//twitter.com/ItangSanjana">Itang Sanjana</a>)
+ <br />kredit <a href="http://www.twitter.com/tfnico">@tfnico</a>, <a
+ href="http://www.twitter.com/fhd">@fhd</a> dan <a href="http://www.namics.com">Namics</a><br />
juga dalam bahasa
<a href="index.html">english</a>,
<a href="index.de.html">deutsch</a>,
@@ -43,7 +61,7 @@ <h1>git - panduan ringkas</h1>
<a href="index.pt_BR.html">português</a>,
<a href="index.ru.html">русский</a>,
<a href="index.tr.html">türkçe</a>,
- <br/>
+ <br />
<a href="index.my.html">မြန်မာ</a>,
<a href="index.ja.html">日本語</a>,
<a href="index.zh.html">中文</a>,
@@ -114,11 +132,13 @@ <h2>tambah & komit</h2>
<div class="scrollblock block-remote">
<h2>mengirim perubahan</h2>
<p>
- Saat ini perubahan telah tersimpan di <b>HEAD</b> salinan kerja lokal kamu. Untuk mengirimkannya ke repositori jarak-jauh, lakukan <br />
+ Saat ini perubahan telah tersimpan di <b>HEAD</b> salinan kerja lokal kamu. Untuk mengirimkannya ke
+ repositori jarak-jauh, lakukan <br />
<code>git push origin master</code><br />
Ubah <i>master</i> sesuai cabang yang kamu inginkan.
<br /><br />
- Jika repositori yang ada belum dikloning dan ingin dihubungkan ke server jarak-jauh, kamu perlu menambahkan<br />
+ Jika repositori yang ada belum dikloning dan ingin dihubungkan ke server jarak-jauh, kamu perlu
+ menambahkan<br />
<code>git remote add origin <server></code><br />
Sekarang kamu bisa mengirimkan perubahan ke server jarak-jauh yang dituju<br />
@@ -128,7 +148,9 @@ <h2>mengirim perubahan</h2>
<div class="scrollblock block-branching">
<h2>percabangan</h2>
<p>
- percabangan atau <i>branching</i> digunakan untuk mengembangkan fitur-fitur secara terisolasi. Cabang utama atau <i>master</i> merupakan cabang bawaan ketika kamu membuat repositori. Gunakan cabang lain untuk pengembangan, setelah selesai, gabungkan kembali ke cabang utama.
+ percabangan atau <i>branching</i> digunakan untuk mengembangkan fitur-fitur secara terisolasi. Cabang utama
+ atau <i>master</i> merupakan cabang bawaan ketika kamu membuat repositori. Gunakan cabang lain untuk
+ pengembangan, setelah selesai, gabungkan kembali ke cabang utama.
</p>
<img src="img/branches.png" alt="" />
<p>
@@ -138,7 +160,8 @@ <h2>percabangan</h2>
<code>git checkout master</code><br />
dan hapus cabang yang tadi dibuat<br />
<code>git branch -d fitur_x</code><br />
- suatu cabang <em>tidak terbuka untuk yang lainnya</em> kecuali jika kamu mengirimkannya ke repositori jarak-jauh.<br />
+ suatu cabang <em>tidak terbuka untuk yang lainnya</em> kecuali jika kamu mengirimkannya ke repositori
+ jarak-jauh.<br />
<code>git push origin <cabang></code>
</p>
</div>
@@ -151,9 +174,11 @@ <h2>perbaru & gabung</h2>
dari direktori kerja kamu untuk <em>mengambil</em> dan <em>menggabungkan</em> perubahan jarak-jauh.<br />
untuk menggabungkan cabang lain ke cabang aktif (misal <i>master</i>), gunakan<br />
<code>git merge <cabang></code><br />
- pada kasus diatas, git mencoba menggabungkan perubahan secara otomatis. Sayangnya hal ini tak selalu berjalan mulus dan bisa menyebabkan <em>konflik</em>.
+ pada kasus diatas, git mencoba menggabungkan perubahan secara otomatis. Sayangnya hal ini tak selalu
+ berjalan mulus dan bisa menyebabkan <em>konflik</em>.
Kamu lah yang bertanggung jawab menggabungkan <em>konflik</em> tersebut
- secara manual dengan menyunting berkas yang ditunjukkan git. Setelah itu, kamu perlu memarkahinya dengan<br />
+ secara manual dengan menyunting berkas yang ditunjukkan git. Setelah itu, kamu perlu memarkahinya
+ dengan<br />
<code>git add <namaberkas></code><br />
sebelum penggabungan berlaku, kamu bisa melakukan pratinjau menggunakan<br />
<code>git diff <cabang_asal> <cabang_tujuan></code>
@@ -163,9 +188,12 @@ <h2>perbaru & gabung</h2>
<div class="scrollblock block-tagging">
<h2>menandai</h2>
<p>
- sangat dianjurkan membuat penanda atau <em>tags</em> untuk perangkat lunak yang dirilis. Hal ini amat lah lazim, yang juga terjadi di SVN. Kamu bisa membuat penanda baru dengan nama <em>1.0.0</em> dengan menjalankan<br />
+ sangat dianjurkan membuat penanda atau <em>tags</em> untuk perangkat lunak yang dirilis. Hal ini amat lah
+ lazim, yang juga terjadi di SVN. Kamu bisa membuat penanda baru dengan nama <em>1.0.0</em> dengan
+ menjalankan<br />
<code>git tag 1.0.0 1b2e1d63ff</code><br />
- <em>1b2e1d63ff</em> adalah 10 karakter pertama dari identitas komit yang ingin kamu referensikan ke penanda. Kamu bisa mendapatkan identitas komit dengan melihat... <br />
+ <em>1b2e1d63ff</em> adalah 10 karakter pertama dari identitas komit yang ingin kamu referensikan ke penanda.
+ Kamu bisa mendapatkan identitas komit dengan melihat... <br />
</p>
</div>
<a name="log"></a>
@@ -174,11 +202,13 @@ <h2>log</h2>
<p>
dalam bentuknya yang paling sederhana, kamu bisa mempelajari riwayat repositori menggunakan..
<code>git log</code><br />
- kamu bisa menambahkan banyak parameter untuk menampilkan log sesuai keinginan. Untuk melihat komit penulis tertentu:<br />
+ kamu bisa menambahkan banyak parameter untuk menampilkan log sesuai keinginan. Untuk melihat komit penulis
+ tertentu:<br />
<code>git log --author=bob</code><br />
Untuk melihat log yang dimampatkan, satu baris per komit:<br />
<code>git log --pretty=oneline</code><br />
- Atau mungkin kamu ingin melihat pohon <i>ASCII art</i> seluruh percabangan disertai nama dan penandanya: <br />
+ Atau mungkin kamu ingin melihat pohon <i>ASCII art</i> seluruh percabangan disertai nama dan penandanya:
+ <br />
<code>git log --graph --oneline --decorate --all</code><br />
Sekedar melihat berkas yang berubah: <br />
<code>git log --name-status</code><br />
@@ -190,12 +220,15 @@ <h2>log</h2>
<div class="scrollblock block-checkout-replace">
<h2>mengembalikan perubahan lokal</h2>
<p>
- Seandainya kamu melakukan kesalahan (yang tentunya tak pernah terjadi ;) kamu bisa mengembalikannya menggunakan perintah<br />
+ Seandainya kamu melakukan kesalahan (yang tentunya tak pernah terjadi ;) kamu bisa mengembalikannya
+ menggunakan perintah<br />
<code>git checkout -- <namaberkas></code><br />
- perintah di atas mengembalikan perubahan di dalam pokok kerja kamu dengan konten terakhir dari <i>HEAD</i>. Perubahan dan berkas baru yang telah ditambahkan ke indeks akan tetap tersimpan.
+ perintah di atas mengembalikan perubahan di dalam pokok kerja kamu dengan konten terakhir dari <i>HEAD</i>.
+ Perubahan dan berkas baru yang telah ditambahkan ke indeks akan tetap tersimpan.
</p>
<p>
- Jika kamu ingin menggugurkan perubahan dan komit lokal seutuhnya, ambil riwayat terakhir dari server dan arahkan ke cabang <i>master</i> lokal seperti ini<br />
+ Jika kamu ingin menggugurkan perubahan dan komit lokal seutuhnya, ambil riwayat terakhir dari server dan
+ arahkan ke cabang <i>master</i> lokal seperti ini<br />
<code>git fetch origin</code><br />
<code>git reset --hard origin/master</code>
</p>
@@ -254,15 +287,22 @@ <h2>Komentar</h2>
var disqus_shortname = 'git-the-simple-guide'; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */
- (function() {
- var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+ (function () {
+ var dsq = document.createElement('script');
+ dsq.type = 'text/javascript';
+ dsq.async = true;
dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
- (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(
+ dsq);
})();
</script>
- <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+ <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by
+ Disqus.</a></noscript>
</div>
- <a href="http://www.git-tower.com/?source=rd" onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
- <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;" class="cheatsheet"></a>
+ <a href="http://www.git-tower.com/?source=rd"
+ onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
+ <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;"
+ class="cheatsheet"></a>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/index.it.html b/index.it.html
index 8cd320e3..a1bdb1a0 100644
--- a/index.it.html
+++ b/index.it.html
@@ -1,37 +1,57 @@
<!DOCTYPE html>
<html lang="en">
+
<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title>git - la guida tascabile - niente di complicato!</title>
- <link href='http://fonts.googleapis.com/css?family=Chelsea+Market' rel='stylesheet' type='text/css'>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <title>git - la guida tascabile - niente di complicato!</title>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/normalize/0/normalize.min.css" type="text/css">
- <link rel="stylesheet" href="css/style.css" type="text/css">
+ <link rel="stylesheet" href="css/style.css" type="text/css">
<script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-652147-13']);
- _gaq.push(['_trackPageview']);
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-652147-13']);
+ _gaq.push(['_trackPageview']);
+
+ (function () {
+ var ga = document.createElement('script');
+ ga.type = 'text/javascript';
+ ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') +
+ '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(ga, s);
+ })();
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
- function recordOutboundLink(link, category, action) {
- _gat._getTrackerByName()._trackEvent(category, action);
- setTimeout('document.location = "' + link.href + '"', 100);
- }
+ function recordOutboundLink(link, category, action) {
+ _gat._getTrackerByName()._trackEvent(category, action);
+ setTimeout('document.location = "' + link.href + '"', 100);
+ }
</script>
</head>
+
<body>
<div class="scrollblock block-title">
<h1>git - la guida tascabile</h1>
<p>Solamente una piccola guida per iniziare con git. Niente di complicato ;)</p>
- <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://rogerdudler.github.com/git-guide" data-via="rogerdudler" data-size="large" data-related="rogerdudler" data-hashtags="git">Tweet</a>
- <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>
+ <a href="https://twitter.com/share" class="twitter-share-button"
+ data-url="http://rogerdudler.github.com/git-guide" data-via="rogerdudler" data-size="large"
+ data-related="rogerdudler" data-hashtags="git">Tweet</a>
+ <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>
<p class="meta">
- by <a href="http://www.twitter.com/rogerdudler">Roger Dudler</a> (translation by <a href="http://www.twitter.com/stecb">@stecb</a>)
- <br />credits to <a href="http://www.twitter.com/tfnico">@tfnico</a>, <a href="http://www.twitter.com/fhd">@fhd</a>, <a href="http://www.namics.com">Namics</a><br />
+ by <a href="http://www.twitter.com/rogerdudler">Roger Dudler</a> (translation by <a
+ href="http://www.twitter.com/stecb">@stecb</a>)
+ <br />credits to <a href="http://www.twitter.com/tfnico">@tfnico</a>, <a
+ href="http://www.twitter.com/fhd">@fhd</a>, <a href="http://www.namics.com">Namics</a><br />
this guide in
<a href="index.html">english</a>,
<a href="index.de.html">deutsch</a>,
@@ -43,7 +63,7 @@ <h1>git - la guida tascabile</h1>
<a href="index.pt_BR.html">português</a>,
<a href="index.ru.html">русский</a>,
<a href="index.tr.html">türkçe</a>,
- <br/>
+ <br />
<a href="index.my.html">မြန်မာ</a>,
<a href="index.ja.html">日本語</a>,
<a href="index.zh.html">中文</a>,
@@ -112,11 +132,13 @@ <h2>aggiungere & validare</h2>
<div class="scrollblock block-remote">
<h2>invio delle modifiche</h2>
<p>
- Quello che hai cambiato ora è nell'<b>HEAD</b> della copia locale. Per inviare queste modifiche al repository remoto, esegui<br />
+ Quello che hai cambiato ora è nell'<b>HEAD</b> della copia locale. Per inviare queste modifiche al
+ repository remoto, esegui<br />
<code>git push origin master</code><br />
Cambia <i>master</i> nel branch al quale vuoi inviare i cambiamenti.
<br /><br />
- Se non hai copiato un repository esistente, e vuoi connettere il tuo repository ad un server remoto, c'e' bisogno che tu lo aggiunga con<br />
+ Se non hai copiato un repository esistente, e vuoi connettere il tuo repository ad un server remoto, c'e'
+ bisogno che tu lo aggiunga con<br />
<code>git remote add origin <server></code><br />
Ora sarai in grado di inviare le tue modifiche al server remoto specificato<br />
@@ -126,7 +148,9 @@ <h2>invio delle modifiche</h2>
<div class="scrollblock block-branching">
<h2>branching</h2>
<p>
- I branch ('ramificazioni') sono utilizzati per sviluppare features che sono isolate l'una dall'altra. Il branch <i>master</i> è quello di default quando crei un repository. Puoi usare altri branch per lo sviluppo ed infine incorporarli ('merge') nel master branch una volta completati.
+ I branch ('ramificazioni') sono utilizzati per sviluppare features che sono isolate l'una dall'altra. Il
+ branch <i>master</i> è quello di default quando crei un repository. Puoi usare altri branch per lo
+ sviluppo ed infine incorporarli ('merge') nel master branch una volta completati.
</p>
<img src="img/branches.png" alt="" />
<p>
@@ -136,7 +160,8 @@ <h2>branching</h2>
<code>git checkout master</code><br />
e cancella il branch creato in precedenza<br />
<code>git branch -d feature_x</code><br />
- il branch </i>non sarà disponibile agli altri</i> fino a quando non verrà inviato al repository remoto<br /><br />
+ il branch </i>non sarà disponibile agli altri</i> fino a quando non verrà inviato al
+ repository remoto<br /><br />
<code>git push origin <branch></code>
</p>
</div>
@@ -146,12 +171,15 @@ <h2>aggiorna & incorpora</h2>
<p>
per aggiornare il tuo repository locale alla commit più recente, esegui<br />
<code>git pull</code><br />
- nella tua directory corrente per fare una <i>fetch</i> (recuperare) ed incorporare(<i>merge</i>) le modifiche fatte sul server remoto. <br />
+ nella tua directory corrente per fare una <i>fetch</i> (recuperare) ed incorporare(<i>merge</i>) le
+ modifiche fatte sul server remoto. <br />
per incorporare un altro branch nel tuo branch attivo (ad esempio master), utilizza<br />
<code>git merge <branch></code><br />
- in entrambi i casi git prova ad auto-incorporare le modifiche. Sfortunatamente, a volte questa procedura automatizzata non è possibile, ed in questo caso ci saranno dei <i>conflitti</i>.
+ in entrambi i casi git prova ad auto-incorporare le modifiche. Sfortunatamente, a volte questa procedura
+ automatizzata non è possibile, ed in questo caso ci saranno dei <i>conflitti</i>.
Sei tu il responsabile che sistemerà questi <i>conflitti</i>
- manualmente modificando i file che git mostrerà. Dopo aver cambiato questi files, dovrai marcarli come 'correttamente incorporati' tramite<br />
+ manualmente modificando i file che git mostrerà. Dopo aver cambiato questi files, dovrai marcarli
+ come 'correttamente incorporati' tramite<br />
<code>git add <nomedelfile></code><br />
prima di immettere le modifiche, potrai anche visualizzarne un'anteprima eseguendo<br />
<code>git diff <branch_sorgente> <branch_target></code>
@@ -161,9 +189,12 @@ <h2>aggiorna & incorpora</h2>
<div class="scrollblock block-tagging">
<h2>tags</h2>
<p>
- È raccomandato creare dei tags nel caso in cui il software venga rilasciato. Questo è un concept già conosciuto, che esiste anche in SVN. Puoi creare un tag chiamato <i>1.0.0</i> eseguendo<br />
+ È raccomandato creare dei tags nel caso in cui il software venga rilasciato. Questo è un
+ concept già conosciuto, che esiste anche in SVN. Puoi creare un tag chiamato <i>1.0.0</i>
+ eseguendo<br />
<code>git tag 1.0.0 1b2e1d63ff</code><br />
- la sequenza <i>1b2e1d63ff</i> sta per i primi 10 caratteri del commit che si vuol referenziare tramite questo tag. Puoi ottenere l'id della commit tramite<br />
+ la sequenza <i>1b2e1d63ff</i> sta per i primi 10 caratteri del commit che si vuol referenziare tramite
+ questo tag. Puoi ottenere l'id della commit tramite<br />
<code>git log</code><br />
puoi anche utilizzare meno caratteri per l'id della commit, basta che sia unico.
</p>
@@ -172,12 +203,15 @@ <h2>tags</h2>
<div class="scrollblock block-checkout-replace">
<h2>sostituire i cambiamenti locali</h2>
<p>
- Nel caso tu abbia fatto qualcosa di sbagliato (ma non capita mai, sicuro ;) puoi sostituire i cambiamenti fatti in locale con il comando<br />
+ Nel caso tu abbia fatto qualcosa di sbagliato (ma non capita mai, sicuro ;) puoi sostituire i cambiamenti
+ fatti in locale con il comando<br />
<code>git checkout -- <nomedelfile></code><br />
- questo rimpiazza le modifiche nell'albero di lavoro con l'ultimo contenuto presente in HEAD. I cambiamenti fatti ed aggiunti all'index, così come i nuovi files, verranno mantenuti.
+ questo rimpiazza le modifiche nell'albero di lavoro con l'ultimo contenuto presente in HEAD. I cambiamenti
+ fatti ed aggiunti all'index, così come i nuovi files, verranno mantenuti.
</p>
<p>
- Se vuoi in alternativa eliminare tutti i cambiamenti e commits fatti in locale, recupera l'ultima versione dal server e fai puntare il tuo master branch a quella versione in questo modo<br />
+ Se vuoi in alternativa eliminare tutti i cambiamenti e commits fatti in locale, recupera l'ultima versione
+ dal server e fai puntare il tuo master branch a quella versione in questo modo<br />
<code>git fetch origin</code><br />
<code>git reset --hard origin/master</code>
</p>
@@ -222,7 +256,8 @@ <h3>le guide</h3>
</div>
<div class="announcement">
<a href="http://frontify.com/?utm_source=gitguide&utm_campaign=founder">
- <img src="http://d13bhd1byokz0o.cloudfront.net/ad/clarify-announcement-git@2x.png" width="960" height="100" alt="Clarify" />
+ <img src="http://d13bhd1byokz0o.cloudfront.net/ad/clarify-announcement-git@2x.png" width="960" height="100"
+ alt="Clarify" />
</a>
</div>
<a name="comments"></a>
@@ -234,15 +269,22 @@ <h2>commenti</h2>
var disqus_shortname = 'git-the-simple-guide'; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */
- (function() {
- var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+ (function () {
+ var dsq = document.createElement('script');
+ dsq.type = 'text/javascript';
+ dsq.async = true;
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
- (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(
+ dsq);
})();
</script>
- <noscript>Per favore abilita JavaScript per essere in grado di vedere i <a href="http://disqus.com/?ref_noscript">commenti - powered by Disqus.</a></noscript>
+ <noscript>Per favore abilita JavaScript per essere in grado di vedere i <a
+ href="http://disqus.com/?ref_noscript">commenti - powered by Disqus.</a></noscript>
</div>
- <a href="http://www.git-tower.com/?source=rd" onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
- <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;" class="cheatsheet"></a>
+ <a href="http://www.git-tower.com/?source=rd"
+ onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
+ <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;"
+ class="cheatsheet"></a>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/index.ja.html b/index.ja.html
index 30dd7f4c..f028186e 100644
--- a/index.ja.html
+++ b/index.ja.html
@@ -1,33 +1,51 @@
<!DOCTYPE html>
<html lang="ja">
+
<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title>git - 簡単ガイド</title>
- <link href='http://fonts.googleapis.com/css?family=Chelsea+Market' rel='stylesheet' type='text/css'>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <title>git - 簡単ガイド</title>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/normalize/0/normalize.min.css" type="text/css">
- <link rel="stylesheet" href="css/style.css" type="text/css">
+ <link rel="stylesheet" href="css/style.css" type="text/css">
<script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-652147-13']);
- _gaq.push(['_trackPageview']);
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-652147-13']);
+ _gaq.push(['_trackPageview']);
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
+ (function () {
+ var ga = document.createElement('script');
+ ga.type = 'text/javascript';
+ ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') +
+ '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(ga, s);
+ })();
</script>
</head>
+
<body>
<div class="scrollblock block-title">
<h1>git - 簡単ガイド</h1>
<p>猫でもわかるGit 最初の一歩</p>
- <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>
- <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>
+ <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>
+ <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>
<p class="meta">
- <a href="http://www.twitter.com/rogerdudler">Roger Dudler</a> (著) <a href="http://www.twitter.com/nacho4d">@nacho4d</a> (訳)
- <br />クレジット <a href="http://www.twitter.com/tfnico">@tfnico</a>, <a href="http://www.twitter.com/fhd">@fhd</a>, <a href="http://www.namics.com">Namics</a><br />
+ <a href="http://www.twitter.com/rogerdudler">Roger Dudler</a> (著) <a
+ href="http://www.twitter.com/nacho4d">@nacho4d</a> (訳)
+ <br />クレジット <a href="http://www.twitter.com/tfnico">@tfnico</a>, <a
+ href="http://www.twitter.com/fhd">@fhd</a>, <a href="http://www.namics.com">Namics</a><br />
その他の言語
<a href="index.html">english</a>,
<a href="index.de.html">deutsch</a>,
@@ -40,7 +58,7 @@ <h1>git - 簡単ガイド</h1>
<a href="index.pt_BR.html">português</a>,
<a href="index.ru.html">русский</a>,
<a href="index.tr.html">türkçe</a>,
- <br/>
+ <br />
<a href="index.my.html">မြန်မာ</a>,
<a href="index.zh.html">中文</a>,
<a href="index.ko.html">한국어</a>
@@ -100,7 +118,7 @@ <h2>作業の流れ</h2>
<div class="scrollblock block-add">
<h2>アッド & コミット</h2>
<p>
- 変更されたファイルを選択します。<br/>
+ 変更されたファイルを選択します。<br />
<code>git add <filename></code><br />
<code>git add *</code><br />
を実行すると<b>Index</b>に追加されます。<br />
@@ -226,7 +244,8 @@ <h3>ガイド</h3>
</div>
<div class="announcement">
<a href="http://frontify.com/?utm_source=gitguide&utm_campaign=founder">
- <img src="http://d13bhd1byokz0o.cloudfront.net/ad/clarify-announcement-git@2x.png" width="960" height="100" alt="Clarify" />
+ <img src="http://d13bhd1byokz0o.cloudfront.net/ad/clarify-announcement-git@2x.png" width="960" height="100"
+ alt="Clarify" />
</a>
</div>
<a name="comments"></a>
@@ -238,15 +257,22 @@ <h2>コメント</h2>
var disqus_shortname = 'git-the-simple-guide'; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */
- (function() {
- var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+ (function () {
+ var dsq = document.createElement('script');
+ dsq.type = 'text/javascript';
+ dsq.async = true;
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
- (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(
+ dsq);
})();
</script>
- <noscript><a href="http://disqus.com/?ref_noscript">コメント - powered by Disqus.</a>を見るにはJavascriptを有効にしてください。</noscript>
+ <noscript><a href="http://disqus.com/?ref_noscript">コメント - powered by
+ Disqus.</a>を見るにはJavascriptを有効にしてください。</noscript>
</div>
- <a href="http://www.git-tower.com/?source=rd" onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
- <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;" class="cheatsheet"></a>
+ <a href="http://www.git-tower.com/?source=rd"
+ onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
+ <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;"
+ class="cheatsheet"></a>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/index.ko.html b/index.ko.html
index 062a77f1..86627eef 100644
--- a/index.ko.html
+++ b/index.ko.html
@@ -1,329 +1,355 @@
<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.1//EN"
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd" xml:lang="ko">
- <head>
- <title>git - 간편 안내서 - 어렵지 않아요!</title>
- <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
- <meta content="IE=edge, chrome=1" http-equiv="X-UA-Compatible" />
- <link href="//fonts.googleapis.com/css?family=Chelsea+Market" rel="stylesheet" type="text/css" />
- <link href="//cdnjs.cloudflare.com/ajax/libs/normalize/0/normalize.min.css" rel="stylesheet" type="text/css" />
- <link href="css/style.css" rel="stylesheet" type="text/css" />
- <style type="text/css">
- /* Korean specific font information */
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd" xml:lang="ko">
- body {
- font-family:
- Georgia, "Times New Roman", Times, /* English on all platforms */
- "Nanum Myeongjo", /* Korean on OS X 10.7 Lion and above */
- AppleMyungjo, /* Korean on Mac OS X 10.6 Snow Leopard and below */
- "Malgun Gothic", /* Sans-serif: Korean on Windows Vista and above */
- Batang, /* Korean on Windows XP and below */
- serif !important; /* Final fallback */
- }
+<head>
+ <title>git - 간편 안내서 - 어렵지 않아요!</title>
+ <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+ <meta content="IE=edge, chrome=1" http-equiv="X-UA-Compatible" />
+ <link href="//cdnjs.cloudflare.com/ajax/libs/normalize/0/normalize.min.css" rel="stylesheet" type="text/css" />
+ <link href="css/style.css" rel="stylesheet" type="text/css" />
+ <style type="text/css">
+ /* Korean specific font information */
- code {
- font-family:
- Menlo, /* English on OS X all versions */
- Consolas, /* English on Windows all versions */
- NanumGothicCoding, /* Korean on all platforms (might not exist!) */
- monospace !important; /* Final fallback */
- }
+ body {
+ font-family:
+ Georgia, "Times New Roman", Times,
+ /* English on all platforms */
+ "Nanum Myeongjo",
+ /* Korean on OS X 10.7 Lion and above */
+ AppleMyungjo,
+ /* Korean on Mac OS X 10.6 Snow Leopard and below */
+ "Malgun Gothic",
+ /* Sans-serif: Korean on Windows Vista and above */
+ Batang,
+ /* Korean on Windows XP and below */
+ serif !important;
+ /* Final fallback */
+ }
- h1, h2 {
- font-family:
- "Chelsea Market", /* English: Google WebFont */
- Georgia, /* English on all platforms */
- "Nanum Pen Script",
- "Nanum Myeongjo", /* Korean on OS X 10.7 Lion and above */
- AppleMyungjo, /* Korean on Mac OS X 10.6 Snow Leopard and below */
- "Malgun Gothic", /* Sans-serif: Korean on Windows Vista and above */
- Batang, /* Korean on Windows XP and below */
- serif !important; /* Final fallback */
- }
- </style>
- <script type="text/javascript">
+ code {
+ font-family:
+ Menlo,
+ /* English on OS X all versions */
+ Consolas,
+ /* English on Windows all versions */
+ NanumGothicCoding,
+ /* Korean on all platforms (might not exist!) */
+ monospace !important;
+ /* Final fallback */
+ }
+
+ h1,
+ h2 {
+ font-family:
+ "Chelsea Market",
+ /* English: Google WebFont */
+ Georgia,
+ /* English on all platforms */
+ "Nanum Pen Script",
+ "Nanum Myeongjo",
+ /* Korean on OS X 10.7 Lion and above */
+ AppleMyungjo,
+ /* Korean on Mac OS X 10.6 Snow Leopard and below */
+ "Malgun Gothic",
+ /* Sans-serif: Korean on Windows Vista and above */
+ Batang,
+ /* Korean on Windows XP and below */
+ serif !important;
+ /* Final fallback */
+ }
+ </style>
+ <script type="text/javascript">
//<![CDATA[
- var _gaq = _gaq || [];
- _gaq.push(["_setAccount", "UA-652147-13"]);
- _gaq.push(["_trackPageview"]);
+ var _gaq = _gaq || [];
+ _gaq.push(["_setAccount", "UA-652147-13"]);
+ _gaq.push(["_trackPageview"]);
- (function() {
- var ga = document.createElement("script");
- ga.async = true;
- ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";
- ga.type = "text/javascript";
+ (function () {
+ var ga = document.createElement("script");
+ ga.async = true;
+ ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";
+ ga.type = "text/javascript";
- var s = document.getElementsByTagName("script")[0];
- s.parentNode.insertBefore(ga, s);
- })();
+ var s = document.getElementsByTagName("script")[0];
+ s.parentNode.insertBefore(ga, s);
+ })();
- function recordOutboundLink(link, category, action) {
- _gat._getTrackerByName()._trackEvent(category, action);
- setTimeout("document.location = \"" + link.href + "\"", 100);
- }
+ function recordOutboundLink(link, category, action) {
+ _gat._getTrackerByName()._trackEvent(category, action);
+ setTimeout("document.location = \"" + link.href + "\"", 100);
+ }
//]]>
- </script>
- </head>
- <body>
- <div class="scrollblock block-title">
- <h1>git - 간편 안내서</h1>
- <p>git을 시작하기 위한 간편 안내서. 어렵지 않아요 ;)</p>
- <a class="twitter-share-button" data-hashtags="git" data-lang="ko" data-related="rogerdudler" data-size="large" data-url="http://rogerdudler.github.io/git-guide/index.ko.html" data-via="rogerdudler" href="https://twitter.com/share">트윗</a>
- <script type="text/javascript">
+ </script>
+</head>
+
+<body>
+ <div class="scrollblock block-title">
+ <h1>git - 간편 안내서</h1>
+ <p>git을 시작하기 위한 간편 안내서. 어렵지 않아요 ;)</p>
+ <a class="twitter-share-button" data-hashtags="git" data-lang="ko" data-related="rogerdudler" data-size="large"
+ data-url="http://rogerdudler.github.io/git-guide/index.ko.html" data-via="rogerdudler"
+ href="https://twitter.com/share">트윗</a>
+ <script type="text/javascript">
//<![CDATA[
- (function(d, s, id) {
- var js, fjs = d.getElementsByTagName(s)[0];
- if(!(d.getElementById(id))) {
- js = d.createElement(s);
- js.id = id;
- js.src = "https://platform.twitter.com/widgets.js";
- fjs.parentNode.insertBefore(js, fjs);
- }
- })(document, "script", "twitter-wjs");
+ (function (d, s, id) {
+ var js, fjs = d.getElementsByTagName(s)[0];
+ if (!(d.getElementById(id))) {
+ js = d.createElement(s);
+ js.id = id;
+ js.src = "https://platform.twitter.com/widgets.js";
+ fjs.parentNode.insertBefore(js, fjs);
+ }
+ })(document, "script", "twitter-wjs");
//]]>
- </script>
- <p class="meta">
- <a href="https://twitter.com/rogerdudler">Roger Dudler</a>가 만들었어요.<br />
- (<a href="https://twitter.com/tfnico">@tfnico</a>, <a href="https://twitter.com/fhd">@fhd</a>와 <a href="http://www.namics.com">Namics</a>의 도움을 받았지요.)<br />
- 번역은 <a href="https://twitter.com/rkjun">Juntai Park</a>과 <a href="http://ardiefox.me">Ardie Hwang</a>이 담당했습니다.<br />
- 문제 보고는 <a href="https://github.com/rogerdudler/git-guide/issues">여기(github)</a>로 해주세요!<br />
- <br />
- 다른 언어판도 읽어보세요!<br />
- <a href="index.html">English</a>,
- <a href="index.de.html">Deutsch</a>,
- <a href="index.es.html">Español</a>,
- <a href="index.fr.html">Français</a>,
- <a href="index.id.html">indonesian</a>,
- <a href="index.it.html">Italiano</a>,
- <a href="index.ja.html">日本語</a>,<br />
- <a href="index.my.html">မြန်မာ</a>,
- <a href="index.nl.html">Nederlands</a>,
- <a href="index.pl.html">polski</a>,
- <a href="index.pt_BR.html">Português</a>,
- <a href="index.ru.html">Русский</a>,
- <a href="index.tr.html">Türkçe</a>,
- <a href="index.zh.html">中文</a><br />
- </p>
- <img src="img/arrow.png" alt="자, 갑시다!" />
- </div>
- <a name="setup"></a>
- <div class="scrollblock block-setup">
- <h2>설치</h2>
- <p><a href="http://git-scm.com/download/mac">OS X용 git 다운로드</a></p>
- <p><a href="http://msysgit.github.io/">Windows용 git 다운로드</a></p>
- <p><a href="http://book.git-scm.com/2_installing_git.html">Linux용 git 다운로드</a></p>
- </div>
- <a name="create"></a>
- <div class="scrollblock block-create">
- <h2>새로운 저장소 만들기</h2>
- <p>
- 폴더를 하나 만들고, 그 안에서 아래 명령을 실행하세요.<br />
- <code>git init</code><br />
- 새로운 git 저장소가 만들어집니다.
- </p>
- </div>
- <a name="checkout"></a>
- <div class="scrollblock block-checkout">
- <h2>저장소 받아오기</h2>
- <p>
- 로컬 저장소를 복제(clone)하려면 아래 명령을 실행하세요.<br />
- <code>git clone /로컬/저장소/경로</code><br />
- 원격 서버의 저장소를 복제하려면 아래 명령을 실행하세요.<br />
- <code>git clone 사용자명@호스트:/원격/저장소/경로</code>
- </p>
- </div>
- <a name="trees"></a>
- <div class="scrollblock block-trees">
- <h2>작업의 흐름</h2>
- <p>
- 여러분의 로컬 저장소는 git이 관리하는 세 그루의 나무로 구성돼있어요.<br />
- 첫번째 나무인 <code>작업 디렉토리(Working directory)</code>는<br />
- 실제 파일들로 이루어져있고, 두번째 나무인 <code>인덱스(Index)</code>는<br />
- 준비 영역(staging area)의 역할을 하며, 마지막 나무인 <code>HEAD</code>는<br />
- 최종 확정본(commit)을 나타내요.
- </p>
- <img src="img/trees.png" alt="로컬 저장소는 이렇게 생겼어요." />
- </div>
- <a name="add"></a>
- <div class="scrollblock block-add">
- <h2>추가와 확정(commit)</h2>
- <p>
- 변경된 파일은 아래 명령어로 (<b>인덱스</b>에) 추가할 수 있어요.<br />
- <code>git add <파일 이름></code><br />
- <code>git add *</code><br />
- 이것이 바로 git의 기본 작업 흐름에서 첫 단계에 해당돼요.<br />
- 하지만 실제로 변경 내용을 확정하려면 아래 명령을 내려야 한답니다.<br />
- <code>git commit -m "이번 확정본에 대한 설명"</code><br />
- 자, 이제 변경된 파일이 <b>HEAD</b>에 반영됐어요.<br />
- 하지만, 원격 저장소에는 아직 반영이 안 됐답니다.
- </p>
- </div>
- <a name="push"></a>
- <div class="scrollblock block-remote">
- <h2>변경 내용 발행(push)하기</h2>
- <p>
- 현재의 변경 내용은 아직 로컬 저장소의 <b>HEAD</b> 안에 머물고 있어요.<br />
- 이제 이 변경 내용을 원격 서버로 올려봅시다. 아래 명령을 실행하세요.<br />
- <code>git push origin master</code><br />
- (다른 가지를 발행하려면 <i>master</i>를 원하는 가지 이름으로 바꿔주세요.)
- <br /><br />
- 만약 기존에 있던 원격 저장소를 복제한 것이 아니라면,<br />
- 원격 서버의 주소를 git에게 알려줘야 해요.<br />
- <code>git remote add origin <원격 서버 주소></code><br />
- 이제 변경 내용을 원격 서버로 발행할 수 있어요.
- </p>
- </div>
- <a name="branching"></a>
- <div class="scrollblock block-branching">
- <h2>가지(branch)치기</h2>
- <p>
- 가지는 안전하게 격리된 상태에서 무언가를 만들 때 사용해요.<br />
- 여러분이 저장소를 새로 만들면 기본으로 <i>master 가지</i>가 만들어집니다.<br />
- 이제 다른 가지를 이용해서 개발을 진행하고, 나중에 개발이 완료되면<br />
- master 가지로 돌아와 병합하면 돼요.
- </p>
- <img src="img/branches.png" alt="가지치기 예제를 보여드리죠." />
- <p>
- 아래 명령으로 "feature_x"라는 이름의 가지를 만들고 갈아탑니다.<br />
- <code>git checkout -b feature_x</code><br />
- 아래 명령으로 master 가지로 돌아올 수 있어요.<br />
- <code>git checkout master</code><br />
- 아래 명령으로는 가지를 삭제할 수 있어요.<br />
- <code>git branch -d feature_x</code><br />
- 여러분이 새로 만든 가지를 원격 저장소로 전송하기 전까지는<br />
- <i>다른 사람들이 접근할 수 없어요</i>.<br />
- <code>git push origin <가지 이름></code>
- </p>
- </div>
- <a name="update"></a>
- <div class="scrollblock block-merging">
- <h2>갱신과 병합(merge)</h2>
- <p>
- 여러분의 로컬 저장소를 원격 저장소에 맞춰 갱신하려면<br />
- 아래 명령을 실행하세요.<br />
- <code>git pull</code><br />
- 이렇게 하면 원격 저장소의 변경 내용이 로컬 작업 디렉토리에<br />
- <i>받아지고(fetch)</i>, <i>병합(merge)</i>된답니다.<br />
- 다른 가지에 있는 변경 내용을 현재 가지(예를 들면, master 가지)에<br />
- 병합하려면 아래 명령을 실행하세요.<br />
- <code>git merge <가지 이름></code><br />
- 첫번째 명령이든 두번째 명령이든, git은<br />
- 자동으로 변경 내용을 병합하려고 시도해요.<br />
- 문제는, 항상 성공하는 게 아니라 가끔<br />
- <i>충돌(conflicts)</i>이 일어나기도 한다는 거예요.<br />
- 이렇게 충돌이 발생하면, git이 알려주는 파일의 충돌 부분을<br />
- 여러분이 직접 수정해서 병합이 가능하도록 해야 하죠.<br />
- 충돌을 해결했다면, 아래 명령으로 git에게<br />
- 아까의 파일을 병합하라고 알려주세요.<br />
- <code>git add <파일 이름></code><br />
- 변경 내용을 병합하기 전에, 어떻게 바뀌었는지 비교해볼 수도 있어요.<br />
- <code>git diff <원래 가지> <비교 대상 가지></code>
- </p>
- </div>
- <a name="tagging"></a>
- <div class="scrollblock block-tagging">
- <h2>꼬리표(tag) 달기</h2>
- <p>
- 소프트웨어의 새 버전을 발표할 때마다 꼬리표를 달아놓으면 좋아요.<br />
- (물론 꼬리표는 SVN 등에 이미 존재하는 기능이지요.)<br />
- 아래 명령을 실행하면 새로운 꼬리표인 <i>1.0.0</i>을 달 수 있어요.<br />
- <code>git tag 1.0.0 1b2e1d63ff</code><br />
- 위 명령에서 <i>1b2e1d63ff</i> 부분은 꼬리표가 가리킬 확정본 식별자입니다.<br />
- 아래 명령으로 확정본 식별자를 얻을 수 있어요.<br />
- <code>git log</code><br />
- 확정본 식별자의 앞부분 일부만 입력해도 꼬리표를 붙일 수 있지만,<br />
- 그 일부분이 반드시 고유하다는 조건이 필요해요.
- </p>
- </div>
- <a name="checkout-replace"></a>
- <div class="scrollblock block-checkout-replace">
- <h2>로컬 변경 내용 되돌리기</h2>
- <p>
- 만약 여러분이 (물론 그럴 일은 없겠지만 ;) 실수로 무언가 잘못한 경우,<br />
- 아래 명령으로 로컬의 변경 내용을 되돌릴 수 있어요.<br />
- <code>git checkout -- <파일 이름></code><br />
- 위 명령은 로컬의 변경 내용을 변경 전 상태(HEAD)로 되돌려줘요.<br />
- 다만, 이미 인덱스에 추가된 변경 내용과<br />
- 새로 생성한 파일은 그대로 남는답니다.
- </p>
- <p>
- 만약, 로컬에 있는 모든 변경 내용과 확정본을 포기하려면,<br />
- 아래 명령으로 원격 저장소의 최신 이력을 가져오고,<br />
- 로컬 master 가지가 저 이력을 가리키도록 할 수 있어요.<br />
- <code>git fetch origin</code><br />
- <code>git reset --hard origin/master</code>
- </p>
- </div>
- <a name="hints"></a>
- <div class="scrollblock block-hints">
- <h2>유용한 힌트</h2>
- <p>
- git의 내장 GUI<br />
- <code>gitk</code><br />
- 콘솔에서 git output을 컬러로 출력하기<br />
- <code>git config color.ui true</code><br />
- 이력(log)에서 확정본 1개를 딱 한 줄로만 표시하기<br />
- <code>git config format.pretty oneline</code><br />
- 파일을 추가할 때 대화식으로 추가하기<br />
- <code>git add -i</code>
- </p>
- </div>
- <a name="resources"></a>
- <div class="scrollblock block-resources">
- <h2>링크 & 자료</h2>
- <h3>그래픽 클라이언트</h3>
- <p>
- <ul>
- <li><a href="http://gitx.laullon.com/">GitX (L) (OS X용, 오픈 소스 소프트웨어)</a></li>
- <li><a href="http://www.git-tower.com/">Tower (OS X용)</a></li>
- <li><a href="http://www.sourcetreeapp.com/">Source Tree (OS X용, 무료)</a></li>
- <li><a href="http://mac.github.com/">GitHub for Mac (OS X용, 무료)</a></li>
- <li><a href="https://itunes.apple.com/kr/app/gitbox/id403388357?mt=12">Gitbox (OS X용, App Store)</a></li>
- </ul>
- </p>
- <h3>한글 안내서</h3>
- <p>
- <ul>
- <li><a href="http://git-scm.com/book/ko">Pro Git</a></li>
- <li><a href="http://marklodato.github.io/visual-git-guide/index-ko.html">A Visual Git Guide</a></li>
- <li><a href="http://dalinaum-kr.tumblr.com/post/15516936704/git-work-flow">Git 작업 흐름</a></li>
- <li><a href="http://learnbranch.urigit.com">Git 브랜치 배우기</a></li>
- </ul>
- </p>
- <h3>영문 안내서</h3>
- <p>
- <ul>
- <li><a href="http://git-scm.com/book/">Pro Git</a></li>
- <li><a href="http://think-like-a-git.net/">Think like a git</a></li>
- <li><a href="http://help.github.com/">GitHub Help</a></li>
- <li><a href="http://marklodato.github.io/visual-git-guide/index-en.html">A Visual Git Guide</a></li>
- </ul>
- </p>
- </div>
- <a name="comments"></a>
- <div class="scrollblock block-comments">
- <h2>댓글</h2>
- <div id="disqus_thread"></div>
- <script type="text/javascript">
+ </script>
+ <p class="meta">
+ <a href="https://twitter.com/rogerdudler">Roger Dudler</a>가 만들었어요.<br />
+ (<a href="https://twitter.com/tfnico">@tfnico</a>, <a href="https://twitter.com/fhd">@fhd</a>와 <a
+ href="http://www.namics.com">Namics</a>의 도움을 받았지요.)<br />
+ 번역은 <a href="https://twitter.com/rkjun">Juntai Park</a>과 <a href="http://ardiefox.me">Ardie Hwang</a>이
+ 담당했습니다.<br />
+ 문제 보고는 <a href="https://github.com/rogerdudler/git-guide/issues">여기(github)</a>로 해주세요!<br />
+ <br />
+ 다른 언어판도 읽어보세요!<br />
+ <a href="index.html">English</a>,
+ <a href="index.de.html">Deutsch</a>,
+ <a href="index.es.html">Español</a>,
+ <a href="index.fr.html">Français</a>,
+ <a href="index.id.html">indonesian</a>,
+ <a href="index.it.html">Italiano</a>,
+ <a href="index.ja.html">日本語</a>,<br />
+ <a href="index.my.html">မြန်မာ</a>,
+ <a href="index.nl.html">Nederlands</a>,
+ <a href="index.pl.html">polski</a>,
+ <a href="index.pt_BR.html">Português</a>,
+ <a href="index.ru.html">Русский</a>,
+ <a href="index.tr.html">Türkçe</a>,
+ <a href="index.zh.html">中文</a><br />
+ </p>
+ <img src="img/arrow.png" alt="자, 갑시다!" />
+ </div>
+ <a name="setup"></a>
+ <div class="scrollblock block-setup">
+ <h2>설치</h2>
+ <p><a href="http://git-scm.com/download/mac">OS X용 git 다운로드</a></p>
+ <p><a href="http://msysgit.github.io/">Windows용 git 다운로드</a></p>
+ <p><a href="http://book.git-scm.com/2_installing_git.html">Linux용 git 다운로드</a></p>
+ </div>
+ <a name="create"></a>
+ <div class="scrollblock block-create">
+ <h2>새로운 저장소 만들기</h2>
+ <p>
+ 폴더를 하나 만들고, 그 안에서 아래 명령을 실행하세요.<br />
+ <code>git init</code><br />
+ 새로운 git 저장소가 만들어집니다.
+ </p>
+ </div>
+ <a name="checkout"></a>
+ <div class="scrollblock block-checkout">
+ <h2>저장소 받아오기</h2>
+ <p>
+ 로컬 저장소를 복제(clone)하려면 아래 명령을 실행하세요.<br />
+ <code>git clone /로컬/저장소/경로</code><br />
+ 원격 서버의 저장소를 복제하려면 아래 명령을 실행하세요.<br />
+ <code>git clone 사용자명@호스트:/원격/저장소/경로</code>
+ </p>
+ </div>
+ <a name="trees"></a>
+ <div class="scrollblock block-trees">
+ <h2>작업의 흐름</h2>
+ <p>
+ 여러분의 로컬 저장소는 git이 관리하는 세 그루의 나무로 구성돼있어요.<br />
+ 첫번째 나무인 <code>작업 디렉토리(Working directory)</code>는<br />
+ 실제 파일들로 이루어져있고, 두번째 나무인 <code>인덱스(Index)</code>는<br />
+ 준비 영역(staging area)의 역할을 하며, 마지막 나무인 <code>HEAD</code>는<br />
+ 최종 확정본(commit)을 나타내요.
+ </p>
+ <img src="img/trees.png" alt="로컬 저장소는 이렇게 생겼어요." />
+ </div>
+ <a name="add"></a>
+ <div class="scrollblock block-add">
+ <h2>추가와 확정(commit)</h2>
+ <p>
+ 변경된 파일은 아래 명령어로 (<b>인덱스</b>에) 추가할 수 있어요.<br />
+ <code>git add <파일 이름></code><br />
+ <code>git add *</code><br />
+ 이것이 바로 git의 기본 작업 흐름에서 첫 단계에 해당돼요.<br />
+ 하지만 실제로 변경 내용을 확정하려면 아래 명령을 내려야 한답니다.<br />
+ <code>git commit -m "이번 확정본에 대한 설명"</code><br />
+ 자, 이제 변경된 파일이 <b>HEAD</b>에 반영됐어요.<br />
+ 하지만, 원격 저장소에는 아직 반영이 안 됐답니다.
+ </p>
+ </div>
+ <a name="push"></a>
+ <div class="scrollblock block-remote">
+ <h2>변경 내용 발행(push)하기</h2>
+ <p>
+ 현재의 변경 내용은 아직 로컬 저장소의 <b>HEAD</b> 안에 머물고 있어요.<br />
+ 이제 이 변경 내용을 원격 서버로 올려봅시다. 아래 명령을 실행하세요.<br />
+ <code>git push origin master</code><br />
+ (다른 가지를 발행하려면 <i>master</i>를 원하는 가지 이름으로 바꿔주세요.)
+ <br /><br />
+ 만약 기존에 있던 원격 저장소를 복제한 것이 아니라면,<br />
+ 원격 서버의 주소를 git에게 알려줘야 해요.<br />
+ <code>git remote add origin <원격 서버 주소></code><br />
+ 이제 변경 내용을 원격 서버로 발행할 수 있어요.
+ </p>
+ </div>
+ <a name="branching"></a>
+ <div class="scrollblock block-branching">
+ <h2>가지(branch)치기</h2>
+ <p>
+ 가지는 안전하게 격리된 상태에서 무언가를 만들 때 사용해요.<br />
+ 여러분이 저장소를 새로 만들면 기본으로 <i>master 가지</i>가 만들어집니다.<br />
+ 이제 다른 가지를 이용해서 개발을 진행하고, 나중에 개발이 완료되면<br />
+ master 가지로 돌아와 병합하면 돼요.
+ </p>
+ <img src="img/branches.png" alt="가지치기 예제를 보여드리죠." />
+ <p>
+ 아래 명령으로 "feature_x"라는 이름의 가지를 만들고 갈아탑니다.<br />
+ <code>git checkout -b feature_x</code><br />
+ 아래 명령으로 master 가지로 돌아올 수 있어요.<br />
+ <code>git checkout master</code><br />
+ 아래 명령으로는 가지를 삭제할 수 있어요.<br />
+ <code>git branch -d feature_x</code><br />
+ 여러분이 새로 만든 가지를 원격 저장소로 전송하기 전까지는<br />
+ <i>다른 사람들이 접근할 수 없어요</i>.<br />
+ <code>git push origin <가지 이름></code>
+ </p>
+ </div>
+ <a name="update"></a>
+ <div class="scrollblock block-merging">
+ <h2>갱신과 병합(merge)</h2>
+ <p>
+ 여러분의 로컬 저장소를 원격 저장소에 맞춰 갱신하려면<br />
+ 아래 명령을 실행하세요.<br />
+ <code>git pull</code><br />
+ 이렇게 하면 원격 저장소의 변경 내용이 로컬 작업 디렉토리에<br />
+ <i>받아지고(fetch)</i>, <i>병합(merge)</i>된답니다.<br />
+ 다른 가지에 있는 변경 내용을 현재 가지(예를 들면, master 가지)에<br />
+ 병합하려면 아래 명령을 실행하세요.<br />
+ <code>git merge <가지 이름></code><br />
+ 첫번째 명령이든 두번째 명령이든, git은<br />
+ 자동으로 변경 내용을 병합하려고 시도해요.<br />
+ 문제는, 항상 성공하는 게 아니라 가끔<br />
+ <i>충돌(conflicts)</i>이 일어나기도 한다는 거예요.<br />
+ 이렇게 충돌이 발생하면, git이 알려주는 파일의 충돌 부분을<br />
+ 여러분이 직접 수정해서 병합이 가능하도록 해야 하죠.<br />
+ 충돌을 해결했다면, 아래 명령으로 git에게<br />
+ 아까의 파일을 병합하라고 알려주세요.<br />
+ <code>git add <파일 이름></code><br />
+ 변경 내용을 병합하기 전에, 어떻게 바뀌었는지 비교해볼 수도 있어요.<br />
+ <code>git diff <원래 가지> <비교 대상 가지></code>
+ </p>
+ </div>
+ <a name="tagging"></a>
+ <div class="scrollblock block-tagging">
+ <h2>꼬리표(tag) 달기</h2>
+ <p>
+ 소프트웨어의 새 버전을 발표할 때마다 꼬리표를 달아놓으면 좋아요.<br />
+ (물론 꼬리표는 SVN 등에 이미 존재하는 기능이지요.)<br />
+ 아래 명령을 실행하면 새로운 꼬리표인 <i>1.0.0</i>을 달 수 있어요.<br />
+ <code>git tag 1.0.0 1b2e1d63ff</code><br />
+ 위 명령에서 <i>1b2e1d63ff</i> 부분은 꼬리표가 가리킬 확정본 식별자입니다.<br />
+ 아래 명령으로 확정본 식별자를 얻을 수 있어요.<br />
+ <code>git log</code><br />
+ 확정본 식별자의 앞부분 일부만 입력해도 꼬리표를 붙일 수 있지만,<br />
+ 그 일부분이 반드시 고유하다는 조건이 필요해요.
+ </p>
+ </div>
+ <a name="checkout-replace"></a>
+ <div class="scrollblock block-checkout-replace">
+ <h2>로컬 변경 내용 되돌리기</h2>
+ <p>
+ 만약 여러분이 (물론 그럴 일은 없겠지만 ;) 실수로 무언가 잘못한 경우,<br />
+ 아래 명령으로 로컬의 변경 내용을 되돌릴 수 있어요.<br />
+ <code>git checkout -- <파일 이름></code><br />
+ 위 명령은 로컬의 변경 내용을 변경 전 상태(HEAD)로 되돌려줘요.<br />
+ 다만, 이미 인덱스에 추가된 변경 내용과<br />
+ 새로 생성한 파일은 그대로 남는답니다.
+ </p>
+ <p>
+ 만약, 로컬에 있는 모든 변경 내용과 확정본을 포기하려면,<br />
+ 아래 명령으로 원격 저장소의 최신 이력을 가져오고,<br />
+ 로컬 master 가지가 저 이력을 가리키도록 할 수 있어요.<br />
+ <code>git fetch origin</code><br />
+ <code>git reset --hard origin/master</code>
+ </p>
+ </div>
+ <a name="hints"></a>
+ <div class="scrollblock block-hints">
+ <h2>유용한 힌트</h2>
+ <p>
+ git의 내장 GUI<br />
+ <code>gitk</code><br />
+ 콘솔에서 git output을 컬러로 출력하기<br />
+ <code>git config color.ui true</code><br />
+ 이력(log)에서 확정본 1개를 딱 한 줄로만 표시하기<br />
+ <code>git config format.pretty oneline</code><br />
+ 파일을 추가할 때 대화식으로 추가하기<br />
+ <code>git add -i</code>
+ </p>
+ </div>
+ <a name="resources"></a>
+ <div class="scrollblock block-resources">
+ <h2>링크 & 자료</h2>
+ <h3>그래픽 클라이언트</h3>
+ <p>
+ <ul>
+ <li><a href="http://gitx.laullon.com/">GitX (L) (OS X용, 오픈 소스 소프트웨어)</a></li>
+ <li><a href="http://www.git-tower.com/">Tower (OS X용)</a></li>
+ <li><a href="http://www.sourcetreeapp.com/">Source Tree (OS X용, 무료)</a></li>
+ <li><a href="http://mac.github.com/">GitHub for Mac (OS X용, 무료)</a></li>
+ <li><a href="https://itunes.apple.com/kr/app/gitbox/id403388357?mt=12">Gitbox (OS X용, App Store)</a></li>
+ </ul>
+ </p>
+ <h3>한글 안내서</h3>
+ <p>
+ <ul>
+ <li><a href="http://git-scm.com/book/ko">Pro Git</a></li>
+ <li><a href="http://marklodato.github.io/visual-git-guide/index-ko.html">A Visual Git Guide</a></li>
+ <li><a href="http://dalinaum-kr.tumblr.com/post/15516936704/git-work-flow">Git 작업 흐름</a></li>
+ <li><a href="http://learnbranch.urigit.com">Git 브랜치 배우기</a></li>
+ </ul>
+ </p>
+ <h3>영문 안내서</h3>
+ <p>
+ <ul>
+ <li><a href="http://git-scm.com/book/">Pro Git</a></li>
+ <li><a href="http://think-like-a-git.net/">Think like a git</a></li>
+ <li><a href="http://help.github.com/">GitHub Help</a></li>
+ <li><a href="http://marklodato.github.io/visual-git-guide/index-en.html">A Visual Git Guide</a></li>
+ </ul>
+ </p>
+ </div>
+ <a name="comments"></a>
+ <div class="scrollblock block-comments">
+ <h2>댓글</h2>
+ <div id="disqus_thread"></div>
+ <script type="text/javascript">
//<![CDATA[
- /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
- var disqus_shortname = "git-the-simple-guide"; // required: replace example with your forum shortname
+ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
+ var disqus_shortname = "git-the-simple-guide"; // required: replace example with your forum shortname
- /* * * DON'T EDIT BELOW THIS LINE * * */
- (function() {
- var dsq = document.createElement("script");
- dsq.async = true;
- dsq.type = "text/javascript";
- dsq.src = ("https:" == document.location.protocol ? "https://" : "http://") + disqus_shortname + ".disqus.com/embed.js";
- (document.getElementsByTagName("head")[0] || document.getElementsByTagName("body")[0]).appendChild(dsq);
- })();
+ /* * * DON'T EDIT BELOW THIS LINE * * */
+ (function () {
+ var dsq = document.createElement("script");
+ dsq.async = true;
+ dsq.type = "text/javascript";
+ dsq.src = ("https:" == document.location.protocol ? "https://" : "http://") + disqus_shortname +
+ ".disqus.com/embed.js";
+ (document.getElementsByTagName("head")[0] || document.getElementsByTagName("body")[0]).appendChild(dsq);
+ })();
//]]>
- </script>
- <noscript><a href="http://disqus.com/?ref_noscript">Disqus</a>에서 제공하는 댓글 기능을 활용하시려면 자바스크립트를 켜 주세요.</noscript>
- </div>
- <a href="http://www.git-tower.com/?source=rd" onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com'); return false;" class="tower"></a>
- <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide'); return false;" class="cheatsheet"></a>
- </body>
-</html>
+ </script>
+ <noscript><a href="http://disqus.com/?ref_noscript">Disqus</a>에서 제공하는 댓글 기능을 활용하시려면 자바스크립트를 켜 주세요.</noscript>
+ </div>
+ <a href="http://www.git-tower.com/?source=rd"
+ onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com'); return false;" class="tower"></a>
+ <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide'); return false;"
+ class="cheatsheet"></a>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/index.my.html b/index.my.html
index 52ecc656..d79d801c 100644
--- a/index.my.html
+++ b/index.my.html
@@ -1,53 +1,71 @@
<!DOCTYPE html>
<html lang="en">
+
<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title>git - the simple guide - no deep shit!</title>
- <link href='http://fonts.googleapis.com/css?family=Chelsea+Market' rel='stylesheet' type='text/css'>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <title>git - the simple guide - no deep shit!</title>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/normalize/0/normalize.min.css" type="text/css">
- <link rel="stylesheet" href="css/style.css" type="text/css">
- <link relf="stylesheet" href="http://mmwebfonts.comquas.com/fonts/?font=Yunghkio" type="text/css">
- <style>
- /*
+ <link rel="stylesheet" href="css/style.css" type="text/css">
+ <link relf="stylesheet" href="http://mmwebfonts.comquas.com/fonts/?font=Yunghkio" type="text/css">
+ <style>
+ /*
fixed for myanmar font
*/
- body {
- font-family:Georgia,"Masterpiece Uni Sans","Yunghkio",sans-serif;
- }
- h2 {
- font-family:'Chelsea Market',"Masterpiece Uni Sans","Yunghkio",Georgia, serif;
- }
- </style>
+ body {
+ font-family: Georgia, "Masterpiece Uni Sans", "Yunghkio", sans-serif;
+ }
+
+ h2 {
+ font-family: 'Chelsea Market', "Masterpiece Uni Sans", "Yunghkio", Georgia, serif;
+ }
+ </style>
<script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-652147-13']);
- _gaq.push(['_trackPageview']);
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-652147-13']);
+ _gaq.push(['_trackPageview']);
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
+ (function () {
+ var ga = document.createElement('script');
+ ga.type = 'text/javascript';
+ ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') +
+ '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(ga, s);
+ })();
- function recordOutboundLink(link, category, action) {
- _gat._getTrackerByName()._trackEvent(category, action);
- setTimeout('document.location = "' + link.href + '"', 100);
- }
+ function recordOutboundLink(link, category, action) {
+ _gat._getTrackerByName()._trackEvent(category, action);
+ setTimeout('document.location = "' + link.href + '"', 100);
+ }
</script>
</head>
+
<body>
<div class="scrollblock block-title">
<h1>git - အရိုးအရှင်းဆုံး လမ်းညွှန်</h1>
<p>အရိုးအရှင်းဆုံး လမ်းညွှန်ဖြစ်သည်။ ထို့ကြောင့် အသေးစိတ် မပါဝင်။ ;)</p>
- <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>
- <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>
+ <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>
+ <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>
<p class="meta">
ရေးသားသူ <a href="http://www.twitter.com/rogerdudler">Roger Dudler</a>
(ဘာသာပြန်သူ <a href="http://www.twitter.com/saturngod">saturngod</a>)
- <br /> ကျေးဇူးတင်ခြင်း <a href="http://www.twitter.com/tfnico">@tfnico</a>, <a href="http://www.twitter.com/fhd">@fhd</a> နှင့် <a href="http://www.namics.com">Namics</a><br />
+ <br /> ကျေးဇူးတင်ခြင်း <a href="http://www.twitter.com/tfnico">@tfnico</a>, <a
+ href="http://www.twitter.com/fhd">@fhd</a> နှင့် <a href="http://www.namics.com">Namics</a><br />
ဒီလမ်းညွှန်ကို
<a href="index.de.html">deutsch</a>,
<a href="index.es.html">español</a>,
@@ -59,16 +77,17 @@ <h1>git - အရိုးအရှင်းဆုံး လမ်းညွှန
<a href="index.pt_BR.html">português</a>,
<a href="index.ru.html">русский</a>,
<a href="index.tr.html">türkçe</a>,
- <br/>
- <a href="index.my.html">မြန်မာ</a>,
+ <br />
+ <a href="index.my.html">မြန်မာ</a>,
<a href="index.ja.html">日本語</a>,
<a href="index.zh.html">中文</a>,
<a href="index.ko.html">한국어</a>
- တို့ဖြင့် ဖတ်နိုင်သည်။
+ တို့ဖြင့် ဖတ်နိုင်သည်။
<br />
- ဆွေးနွေးခြင်းနှင့် ပြင်ဆင်ရန် အချက်များ ကို <a href="https://github.com/rogerdudler/git-guide/issues">github</a> တွင် တင်ပေးပါ။
+ ဆွေးနွေးခြင်းနှင့် ပြင်ဆင်ရန် အချက်များ ကို <a
+ href="https://github.com/rogerdudler/git-guide/issues">github</a> တွင် တင်ပေးပါ။
</p>
<img src="img/arrow.png" alt="" />
</div>
@@ -90,8 +109,8 @@ <h2>ပြင်ဆင်ခြင်း</h2>
<div class="scrollblock block-create">
<h2>repository အသစ် ဖန်တီးခြင်း</h2>
<p>
- directory အသစ် တစ်ခုတည်ဆောက်ပါ။ ပြီးလျှင် terminal မှာ အောက်ကလို ရိုက်ပါ။
- <br />
+ directory အသစ် တစ်ခုတည်ဆောက်ပါ။ ပြီးလျှင် terminal မှာ အောက်ကလို ရိုက်ပါ။
+ <br />
<code>git init</code><br />
ဆိုပြီး git repository တစ်ခုကို စတင်ပါ။
</p>
@@ -100,9 +119,9 @@ <h2>repository အသစ် ဖန်တီးခြင်း</h2>
<div class="scrollblock block-checkout">
<h2>repository ကို checkout လုပ်ခြင်း</h2>
<p>
- copy အနေနဲ့ ပွားပြီးတော့ အလုပ်လုပ်မယ်ဆိုရင်တော့ အောက်က command ကို အသုံးပြုရပါတယ်။ <br/>
+ copy အနေနဲ့ ပွားပြီးတော့ အလုပ်လုပ်မယ်ဆိုရင်တော့ အောက်က command ကို အသုံးပြုရပါတယ်။ <br />
<code>git clone /path/to/repository</code><br />
- တကယ်လို့ server နဲ့ အလုပ်လုပ်တာဆိုရင်တော့ အောက်ကလို အသုံးပြုရပါတယ်။ <br/>
+ တကယ်လို့ server နဲ့ အလုပ်လုပ်တာဆိုရင်တော့ အောက်ကလို အသုံးပြုရပါတယ်။ <br />
<code>git clone username@host:/path/to/repository</code>
</p>
</div>
@@ -110,13 +129,13 @@ <h2>repository ကို checkout လုပ်ခြင်း</h2>
<div class="scrollblock block-trees">
<h2>အလုပ်လုပ်ပုံ</h2>
<p>
- သင့် local repository မှာ git က ထိန်းသိမ်းဆောက်ရွက်တဲ့ ဆင့်ပွား ၃ ခု ရှိပါတယ်။
- ပထမ တစ်ခုကတော့ <code>Working Directory</code> ပါ။
- သူကတော့ လက်ရှိ file တွေကို သိမ်းထားပေးပါတယ်။
- ဒုတိယ တစ်ခုကတော့ <code>Index</code> ပါ။
- သူကတော့ staging area ပါ။
- နောက်ဆုံးကတော့ <code>HEAD</code> ပါ။
- နောက်ဆုံး သင် commit လုပ်ထားတဲ့ နေရာကို ညွှန်ပြထားပါတယ်။
+ သင့် local repository မှာ git က ထိန်းသိမ်းဆောက်ရွက်တဲ့ ဆင့်ပွား ၃ ခု ရှိပါတယ်။
+ ပထမ တစ်ခုကတော့ <code>Working Directory</code> ပါ။
+ သူကတော့ လက်ရှိ file တွေကို သိမ်းထားပေးပါတယ်။
+ ဒုတိယ တစ်ခုကတော့ <code>Index</code> ပါ။
+ သူကတော့ staging area ပါ။
+ နောက်ဆုံးကတော့ <code>HEAD</code> ပါ။
+ နောက်ဆုံး သင် commit လုပ်ထားတဲ့ နေရာကို ညွှန်ပြထားပါတယ်။
</p>
<img src="img/trees.png" alt="" />
@@ -125,28 +144,30 @@ <h2>အလုပ်လုပ်ပုံ</h2>
<div class="scrollblock block-add">
<h2>add နှင့် commit</h2>
<p>
- ပြင်ဆင်ထားတာများကို ထည့်သွင်းလိုလည်း အောက်ပါ အတိုင်း အသုံးပြုနိုင်သည်။ <br/>
+ ပြင်ဆင်ထားတာများကို ထည့်သွင်းလိုလည်း အောက်ပါ အတိုင်း အသုံးပြုနိုင်သည်။ <br />
<code>git add <filename></code><br />
<code>git add *</code><br />
- ဒီ အဆင့်က ပထမ အဆင့်ပါ။ ပြောင်းလဲထားသည်များကို commit လုပ်လိုလျှင် <br/>
+ ဒီ အဆင့်က ပထမ အဆင့်ပါ။ ပြောင်းလဲထားသည်များကို commit လုပ်လိုလျှင် <br />
<code>git commit -m "Commit message"</code><br />
- ပြင်ဆင်ထားသည်များကို <b>HEAD</b> တွင် မှတ်ထားပြီးသားဖြစ်သည်။ သို့သော် remote repository ပေါ်သို့ မရောက်သေးပါ။
+ ပြင်ဆင်ထားသည်များကို <b>HEAD</b> တွင် မှတ်ထားပြီးသားဖြစ်သည်။ သို့သော် remote repository ပေါ်သို့
+ မရောက်သေးပါ။
</p>
</div>
<a name="push"></a>
<div class="scrollblock block-remote">
<h2>pushing changes</h2>
<p>
- သင်ပြင်ဆင်ထားတာတွေက အခု သင့်ရဲ့ local working copy နေရာက <b><HEAD></b> မှာ ရောက်နေပါပြီ။ <br/>
- ပြောင်းလဲထားတဲ့ code တွေကို remote repository ဆီပို့ဖို့ အတွက်
- <br/>
+ သင်ပြင်ဆင်ထားတာတွေက အခု သင့်ရဲ့ local working copy နေရာက <b><HEAD></b> မှာ ရောက်နေပါပြီ။ <br />
+ ပြောင်းလဲထားတဲ့ code တွေကို remote repository ဆီပို့ဖို့ အတွက်
+ <br />
<code>git push origin master</code><br />
<i>master</i> ကို သင့်ရဲ့ စိတ်ကြိုက် branch ပြောင်းနိုင်ပါတယ်။ သင် ပို့ချင်တဲ့ branch တစ်ခုခုကိုပေါ့။
<br /><br />
- တကယ်လို့ သင်က cloned မလုပ်ချင်ဘူး။ လက်ရှိ ရှိထားတဲ့ code ကို remote server နဲ့ ချိတ်ဆက်ချင်တယ်ဆိုရင်တော့ <br/>
+ တကယ်လို့ သင်က cloned မလုပ်ချင်ဘူး။ လက်ရှိ ရှိထားတဲ့ code ကို remote server နဲ့ ချိတ်ဆက်ချင်တယ်ဆိုရင်တော့
+ <br />
<code>git remote add origin <server></code><br />
- အခု သင်ရဲ့ code ကို သင်ရွေးချယ်ထားတဲ့ remote server ပေါ်တင်လို့ရပါပြီ။ <br/>
+ အခု သင်ရဲ့ code ကို သင်ရွေးချယ်ထားတဲ့ remote server ပေါ်တင်လို့ရပါပြီ။ <br />
</p>
</div>
@@ -154,21 +175,21 @@ <h2>pushing changes</h2>
<div class="scrollblock block-branching">
<h2>branching</h2>
<p>
- Branches တွေကို develop အဆင့်တွေမှာ အသုံးပြုပါတယ်။
- <i>master</i> branch ကတော့ repository အသစ်ဖန်တီးတဲ့အခါမှာ ပုံသေပါလာပါတယ်။
- တကယ်လို့ development အတွက် အြခား branches တွေခွဲထွက်ပြီး အကုန်ပြီးစီးမှသာ master branch နဲ့ ပြန်ပေါင်းပါတယ်။
+ Branches တွေကို develop အဆင့်တွေမှာ အသုံးပြုပါတယ်။
+ <i>master</i> branch ကတော့ repository အသစ်ဖန်တီးတဲ့အခါမှာ ပုံသေပါလာပါတယ်။
+ တကယ်လို့ development အတွက် အြခား branches တွေခွဲထွက်ပြီး အကုန်ပြီးစီးမှသာ master branch နဲ့ ပြန်ပေါင်းပါတယ်။
</p>
<img src="img/branches.png" alt="" />
<p>
- "feature_x" ဆိုတဲ့ branch အသစ်ဆောက်ပြီး ထို branch ကို ပြောင်းလဲ အသုံးပြုပုံ<br/>
+ "feature_x" ဆိုတဲ့ branch အသစ်ဆောက်ပြီး ထို branch ကို ပြောင်းလဲ အသုံးပြုပုံ<br />
<code>git checkout -b feature_x</code><br />
- master branch ကို ပြန်ပြောင်းပုံ <br/>
+ master branch ကို ပြန်ပြောင်းပုံ <br />
<code>git checkout master</code><br />
branch ကို ဖျက်ခြင်း<br />
<code>git branch -d feature_x</code><br />
- branch ကို remote repository ကို push လုပ်လိုလျှင် <br/>
+ branch ကို remote repository ကို push လုပ်လိုလျှင် <br />
<code>git push origin <branch></code>
</p>
@@ -178,23 +199,25 @@ <h2>branching</h2>
<h2>အသစ်ဆွဲချခြင်း နှင့် ပေါင်းစည်းခြင်း</h2>
<p>
- local repository ကို remote repository တွင် အသစ် commit လုပ်ထားသည်များကို ဆွဲချလိုလျှင်<br/>
+ local repository ကို remote repository တွင် အသစ် commit လုပ်ထားသည်များကို ဆွဲချလိုလျှင်<br />
<code>git pull</code><br />
- <i>pull</i> လို့ ခေါ်တဲ့အခါမှာ working directory ထဲသို့ နောက်ဆုံး ပြောင်းထားသည်များကို <i>fetch</i> နှင့် <i>merge</i> လုပ်သွားပါမယ်။<br/>
+ <i>pull</i> လို့ ခေါ်တဲ့အခါမှာ working directory ထဲသို့ နောက်ဆုံး ပြောင်းထားသည်များကို <i>fetch</i> နှင့်
+ <i>merge</i> လုပ်သွားပါမယ်။<br />
- လက်ရှိ အလုပ်လုပ်နေသော branch (ဥပမာ။။ master) ထဲကို အခြား branch မှ လာပေါင်းလိုလျှင် <br/>
+ လက်ရှိ အလုပ်လုပ်နေသော branch (ဥပမာ။။ master) ထဲကို အခြား branch မှ လာပေါင်းလိုလျှင် <br />
<code>git merge <branch></code><br />
ထိုအခါ git က အလိုအလျှောက် ပြင်ထားသည်များကို ပေါင်းပေးပါလိမ့်မယ်။
သို့သော်လည်း အမြဲတန်း အဆင်မပြေပါ။ တစ်ခါတစ်လေ <i>conflicts</i> ဖြစ်တာလေးတွေ ရှိတတ်ပါတယ်။
- ထို အခါ <i>conflicts</i> ဖြစ်တာကို ကိုယ့်ဘာသာကိုယ် ပေါင်းဖို့ လုပ်ဆောင်ရပါတော့တယ်။
+ ထို အခါ <i>conflicts</i> ဖြစ်တာကို ကိုယ့်ဘာသာကိုယ် ပေါင်းဖို့ လုပ်ဆောင်ရပါတော့တယ်။
- <i>conflicts</i> ဖြစ်နေတဲ့ file များကို git တွင်ဖော်ထားပါတယ်။ ထို file များကို ကိုယ့်ဘာသာကိုယ် ပြင်ဆင်ပြီးရင် ပြန်ပြီးတော့ ထည့်ပေးဖို့ လိုပါတယ်။<br/>
+ <i>conflicts</i> ဖြစ်နေတဲ့ file များကို git တွင်ဖော်ထားပါတယ်။ ထို file များကို ကိုယ့်ဘာသာကိုယ်
+ ပြင်ဆင်ပြီးရင် ပြန်ပြီးတော့ ထည့်ပေးဖို့ လိုပါတယ်။<br />
<code>git add <filename></code><br />
- မပေါင်းခင်မှာ အရင်ဆုံး ပြောင်းထားတဲ့ code တွေကို ယှဉ်ကြည့်နိုင်ပါတယ်။<br/>
+ မပေါင်းခင်မှာ အရင်ဆုံး ပြောင်းထားတဲ့ code တွေကို ယှဉ်ကြည့်နိုင်ပါတယ်။<br />
<code>git diff <source_branch> <target_branch></code>
</p>
</div>
@@ -202,26 +225,29 @@ <h2>အသစ်ဆွဲချခြင်း နှင့် ပေါင်
<div class="scrollblock block-tagging">
<h2>tagging</h2>
<p>
- software version တစ်ခုကို ထုတ်လိုက်တိုင်းမှာ tag ကို အသုံးပြု အကြံပြုပါတယ်။
- ဒါသုံးခြင်းက SVN မှာ ပါပြီးသား အယူအဆ တစ်ခုပါ။
- သင့်အနေနဲ့ tag နာမည် အသစ် <i>1.0.0</i> ဆိုပြီး ပေးနိုင်ပါတယ်။ <br/>
+ software version တစ်ခုကို ထုတ်လိုက်တိုင်းမှာ tag ကို အသုံးပြု အကြံပြုပါတယ်။
+ ဒါသုံးခြင်းက SVN မှာ ပါပြီးသား အယူအဆ တစ်ခုပါ။
+ သင့်အနေနဲ့ tag နာမည် အသစ် <i>1.0.0</i> ဆိုပြီး ပေးနိုင်ပါတယ်။ <br />
<code>git tag 1.0.0 1b2e1d63ff</code><br />
- <i>1b2e1d63ff</i> ကတော့ သင် tag လုပ်ချင်တဲ့ commit id ရဲ့ ပထမ စာလုံး ၁၀ လုံး ပါ။
- သင့် အနေနဲ့ commit id ကို အောက်ကလို ရိုက်ပြီး ရယူနိုင်ပါတယ်။<br />
+ <i>1b2e1d63ff</i> ကတော့ သင် tag လုပ်ချင်တဲ့ commit id ရဲ့ ပထမ စာလုံး ၁၀ လုံး ပါ။
+ သင့် အနေနဲ့ commit id ကို အောက်ကလို ရိုက်ပြီး ရယူနိုင်ပါတယ်။<br />
<code>git log</code><br />
- သင့်အနေနဲ့ commit id ရဲ့ အခြားစာလုံး အနည်းငယ်ကို အသုံးပြုနိုင်ပါတယ်။ သို့ပေမယ့် အဲဒီ id ဟာ ဘယ်သူမှ အသုံးမပြုထားပဲ ကင်းရှင်းဖို့ သို့မဟုတ် unique ဖြစ်ဖို့ လိုပါတယ်။
+ သင့်အနေနဲ့ commit id ရဲ့ အခြားစာလုံး အနည်းငယ်ကို အသုံးပြုနိုင်ပါတယ်။ သို့ပေမယ့် အဲဒီ id ဟာ ဘယ်သူမှ
+ အသုံးမပြုထားပဲ ကင်းရှင်းဖို့ သို့မဟုတ် unique ဖြစ်ဖို့ လိုပါတယ်။
</p>
</div>
<a name="checkout-replace"></a>
<div class="scrollblock block-checkout-replace">
<h2>local ပြောင်းလဲခြင်းများကို အစားထိုးခြင်း</h2>
<p>
- တကယ်လို့ တခုခုမှားသွားပြီး local ထဲက file နဲ့ ပြန် အစားထိုးချင်ရင် <br/>
+ တကယ်လို့ တခုခုမှားသွားပြီး local ထဲက file နဲ့ ပြန် အစားထိုးချင်ရင် <br />
<code>git checkout -- <filename></code><br />
- အခု ပြောင်းလဲလိုက်တာက သင့်ရဲ့ working tree ထဲက HEAD ထဲ က နောက်ဆုံး content မှာ သွားပြီးတော့ အစားထိုးသွားမှာပါ။ ပြောင်းထားတာတွေကိုတော့ index အနေနဲ့ ထည့်ပြီး files အသစ်တွေကိုလည်း သိမ်းထားပါလိမ့်မယ်။
+ အခု ပြောင်းလဲလိုက်တာက သင့်ရဲ့ working tree ထဲက HEAD ထဲ က နောက်ဆုံး content မှာ သွားပြီးတော့
+ အစားထိုးသွားမှာပါ။ ပြောင်းထားတာတွေကိုတော့ index အနေနဲ့ ထည့်ပြီး files အသစ်တွေကိုလည်း သိမ်းထားပါလိမ့်မယ်။
</p>
<p>
- အကယ်၍ သင့်အနေနဲ့ local changes နှင့် commits တွေကို ဖျက်ချပြီး နောက်ဆုံး server နှင့် master branch က အကုန် ဆွဲယူပြီး အစားထိုးချင်ရင်<br/>
+ အကယ်၍ သင့်အနေနဲ့ local changes နှင့် commits တွေကို ဖျက်ချပြီး နောက်ဆုံး server နှင့် master branch က အကုန်
+ ဆွဲယူပြီး အစားထိုးချင်ရင်<br />
<code>git fetch origin</code><br />
<code>git reset --hard origin/master</code>
</p>
@@ -266,7 +292,8 @@ <h3>အသုံးပြုပုံ လမ်းညွှန်များ</h
</div>
<div class="announcement">
<a href="http://frontify.com/?utm_source=gitguide&utm_campaign=founder">
- <img src="http://d13bhd1byokz0o.cloudfront.net/ad/clarify-announcement-git@2x.png" width="960" height="100" alt="Clarify" />
+ <img src="http://d13bhd1byokz0o.cloudfront.net/ad/clarify-announcement-git@2x.png" width="960" height="100"
+ alt="Clarify" />
</a>
</div>
<a name="comments"></a>
@@ -278,15 +305,22 @@ <h2>မှတ်ချက်များ</h2>
var disqus_shortname = 'git-the-simple-guide'; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */
- (function() {
- var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+ (function () {
+ var dsq = document.createElement('script');
+ dsq.type = 'text/javascript';
+ dsq.async = true;
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
- (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(
+ dsq);
})();
</script>
- <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+ <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by
+ Disqus.</a></noscript>
</div>
- <a href="http://www.git-tower.com/?source=rd" onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
- <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;" class="cheatsheet"></a>
+ <a href="http://www.git-tower.com/?source=rd"
+ onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
+ <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;"
+ class="cheatsheet"></a>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/index.nl.html b/index.nl.html
index 9a818dc9..2272e12b 100644
--- a/index.nl.html
+++ b/index.nl.html
@@ -1,38 +1,56 @@
<!DOCTYPE html>
<html lang="en">
+
<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title>git - een simpele uitleg - no deep shit!</title>
- <link href='http://fonts.googleapis.com/css?family=Chelsea+Market' rel='stylesheet' type='text/css'>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <title>git - een simpele uitleg - no deep shit!</title>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/normalize/0/normalize.min.css" type="text/css">
- <link rel="stylesheet" href="css/style.css" type="text/css">
+ <link rel="stylesheet" href="css/style.css" type="text/css">
<script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-652147-13']);
- _gaq.push(['_trackPageview']);
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-652147-13']);
+ _gaq.push(['_trackPageview']);
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
+ (function () {
+ var ga = document.createElement('script');
+ ga.type = 'text/javascript';
+ ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') +
+ '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(ga, s);
+ })();
- function recordOutboundLink(link, category, action) {
- _gat._getTrackerByName()._trackEvent(category, action);
- setTimeout('document.location = "' + link.href + '"', 100);
- }
+ function recordOutboundLink(link, category, action) {
+ _gat._getTrackerByName()._trackEvent(category, action);
+ setTimeout('document.location = "' + link.href + '"', 100);
+ }
</script>
</head>
+
<body>
<div class="scrollblock block-title">
<h1>git - een simpele uitleg</h1>
<p>een korte gids om je op weg te helpen met git, no deep shit :)</p>
- <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>
- <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>
+ <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>
+ <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>
<p class="meta">
- door <a href="http://www.twitter.com/rogerdudler">Roger Dudler</a> (vertaling door <a href="http://github.com/pierot">Pieter Michels</a>)
- <br />dank aan <a href="http://www.twitter.com/tfnico">@tfnico</a>, <a href="http://www.twitter.com/fhd">@fhd</a> en <a href="http://www.namics.com">Namics</a><br />
+ door <a href="http://www.twitter.com/rogerdudler">Roger Dudler</a> (vertaling door <a
+ href="http://github.com/pierot">Pieter Michels</a>)
+ <br />dank aan <a href="http://www.twitter.com/tfnico">@tfnico</a>, <a
+ href="http://www.twitter.com/fhd">@fhd</a> en <a href="http://www.namics.com">Namics</a><br />
gids in
<a href="index.html">english</a>,
<a href="index.de.html">deutsch</a>,
@@ -44,7 +62,7 @@ <h1>git - een simpele uitleg</h1>
<a href="index.pt_BR.html">português</a>,
<a href="index.ru.html">русский</a>,
<a href="index.tr.html">türkçe</a>,
- <br/>
+ <br />
<a href="index.my.html">မြန်မာ</a>,
<a href="index.ja.html">日本語</a>,
<a href="index.zh.html">中文</a>,
@@ -119,7 +137,8 @@ <h2>add & commit</h2>
<h2>pushing changes</h2>
<p>
Je aanpassingen zitten nu in de <b>HEAD</b> van je lokale werk-repository.<br />
- Om deze aanpassingen door te sturen naar je repository op een andere lokatie, voer dan volgend commando uit <br />
+ Om deze aanpassingen door te sturen naar je repository op een andere lokatie, voer dan volgend commando uit
+ <br />
<code>git push origin master</code><br />
Verander <i>master</i> naar de branch-naam<br />
waar je je aanpassingen naar wil sturen.
@@ -128,16 +147,19 @@ <h2>pushing changes</h2>
met een bestaande repository (op een andere server bijvoorbeeld), <br />
voeg dan de bestaande repository toe aan je lokale repository<br />
<code>git remote add origin <server></code><br />
- Nu kan je je lokale aanpassingen, en dus ook je lokale repository, synchroniseren met de server die je net hebt toegevoegd.<br />
+ Nu kan je je lokale aanpassingen, en dus ook je lokale repository, synchroniseren met de server die je net
+ hebt toegevoegd.<br />
</p>
</div>
<a name="branching"></a>
<div class="scrollblock block-branching">
<h2>branching</h2>
<p>
- Branches worden gebruikt om verschillende features te ontwikkelen in geïsoleerde omgevingen, los van elkaar. <br />
+ Branches worden gebruikt om verschillende features te ontwikkelen in geïsoleerde omgevingen, los van elkaar.
+ <br />
De <i>master</i> branch is de basis of standaard branch wanneer je een nieuwe repository aanmaakt. <br />
- Maak nieuwe branches aan wanneer je nieuwe toevoegingen ontwikkelt en voeg ze samen (<i>merge</i>) met de <i>master</i> branch wanneer je klaar bent.
+ Maak nieuwe branches aan wanneer je nieuwe toevoegingen ontwikkelt en voeg ze samen (<i>merge</i>) met de
+ <i>master</i> branch wanneer je klaar bent.
</p>
<img src="img/branches.png" alt="" />
<p>
@@ -157,7 +179,8 @@ <h2>branching</h2>
<div class="scrollblock block-merging">
<h2>update & merge</h2>
<p>
- om je lokale repository te updaten naar de laatste versie, voer dan volgend commando uit in je lokale repository<br />
+ om je lokale repository te updaten naar de laatste versie, voer dan volgend commando uit in je lokale
+ repository<br />
<code>git pull</code><br />
op die manier kan je de aanpassingen <i>fetchen</i> <br />
en <i>mergen</i> met je lokale bestanden.<br />
@@ -168,7 +191,8 @@ <h2>update & merge</h2>
Je bent dan zelf verantwoordelijk om de <i>conflicten</i> manueel op te lossen en te <i>mergen</i>.
Na de aanpassingen moet je de aangepaste bestanden opnieuw toevoegen aan je lokale repository<br />
<code>git add <filename></code><br />
- alvorens je aanpassingen dan terug samen te voegen kan je ook de aangepaste code bekijken door middel van<br />
+ alvorens je aanpassingen dan terug samen te voegen kan je ook de aangepaste code bekijken door middel
+ van<br />
<code>git diff <source_branch> <target_branch></code>
</p>
</div>
@@ -176,10 +200,12 @@ <h2>update & merge</h2>
<div class="scrollblock block-tagging">
<h2>tagging</h2>
<p>
- net zoals in SVN is het aangewezen om verschillende releases van je applicatie in een tag te steken. Je kan een nieuwe tag aanmaken met de naam <i>1.0.0</i> door volgend commando uit te voeren<br />
+ net zoals in SVN is het aangewezen om verschillende releases van je applicatie in een tag te steken. Je kan
+ een nieuwe tag aanmaken met de naam <i>1.0.0</i> door volgend commando uit te voeren<br />
<code>git tag 1.0.0 1b2e1d63ff</code><br />
het <i>1b2e1d63ff</i> gedeelte van het commando<br />
- staat voor de eerste 10 karakters van de commit id die je in een tag wil steken.<br />De commit id kan je opvragen door volgend commando uit te voegen <br />
+ staat voor de eerste 10 karakters van de commit id die je in een tag wil steken.<br />De commit id kan je
+ opvragen door volgend commando uit te voegen <br />
<code>git log</code><br />
het hoeven niet per se de eerste 10 karakters van de commit id te zijn, zolang ze maar uniek zijn.
</p>
@@ -188,12 +214,15 @@ <h2>tagging</h2>
<div class="scrollblock block-checkout-replace">
<h2>replace local changes</h2>
<p>
- In het geval dat je wil terug gaan naar een vorige versie van een bestand (fouten maken kan gebeuren hé) gebruik je <br />
+ In het geval dat je wil terug gaan naar een vorige versie van een bestand (fouten maken kan gebeuren hé)
+ gebruik je <br />
<code>git checkout -- <filename></code><br />
- dit zal het bestand in je huidige werkmap vervangen door de laatste versie die zich in de HEAD tree bevindt. De aanpassingen die je reeds hebt toegevoegd én de nieuw aangemaakte bestanden blijven behouden.
+ dit zal het bestand in je huidige werkmap vervangen door de laatste versie die zich in de HEAD tree bevindt.
+ De aanpassingen die je reeds hebt toegevoegd én de nieuw aangemaakte bestanden blijven behouden.
</p>
<p>
- Stel nu dat je alle lokale aanpassingen wil vervangen door de laatste versie van de repository die zich op de server bevindt <br />
+ Stel nu dat je alle lokale aanpassingen wil vervangen door de laatste versie van de repository die zich op
+ de server bevindt <br />
kan je volgende commando reeks gebruiken<br />
<code>git fetch origin</code><br />
<code>git reset --hard origin/master</code>
@@ -239,7 +268,8 @@ <h3>andere gidsen</h3>
</div>
<div class="announcement">
<a href="http://frontify.com/?utm_source=gitguide&utm_campaign=founder">
- <img src="http://d13bhd1byokz0o.cloudfront.net/ad/clarify-announcement-git@2x.png" width="960" height="100" alt="Clarify" />
+ <img src="http://d13bhd1byokz0o.cloudfront.net/ad/clarify-announcement-git@2x.png" width="960" height="100"
+ alt="Clarify" />
</a>
</div>
<a name="comments"></a>
@@ -251,15 +281,22 @@ <h2>comments</h2>
var disqus_shortname = 'git-the-simple-guide'; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */
- (function() {
- var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+ (function () {
+ var dsq = document.createElement('script');
+ dsq.type = 'text/javascript';
+ dsq.async = true;
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
- (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(
+ dsq);
})();
</script>
- <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+ <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by
+ Disqus.</a></noscript>
</div>
- <a href="http://www.git-tower.com/?source=rd" onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
- <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;" class="cheatsheet"></a>
+ <a href="http://www.git-tower.com/?source=rd"
+ onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
+ <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;"
+ class="cheatsheet"></a>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/index.pl.html b/index.pl.html
index d69f0a75..abb385a1 100644
--- a/index.pl.html
+++ b/index.pl.html
@@ -1,38 +1,55 @@
<!DOCTYPE html>
<html lang="pl">
+
<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title>git - prosty przewodnik - nic skomplikowanego!</title>
- <link href='http://fonts.googleapis.com/css?family=Chelsea+Market' rel='stylesheet' type='text/css'>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <title>git - prosty przewodnik - nic skomplikowanego!</title>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/normalize/0/normalize.min.css" type="text/css">
- <link rel="stylesheet" href="css/style.css" type="text/css">
+ <link rel="stylesheet" href="css/style.css" type="text/css">
<script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-652147-13']);
- _gaq.push(['_trackPageview']);
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-652147-13']);
+ _gaq.push(['_trackPageview']);
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
+ (function () {
+ var ga = document.createElement('script');
+ ga.type = 'text/javascript';
+ ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') +
+ '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(ga, s);
+ })();
- function recordOutboundLink(link, category, action) {
- _gat._getTrackerByName()._trackEvent(category, action);
- setTimeout('document.location = "' + link.href + '"', 100);
- }
+ function recordOutboundLink(link, category, action) {
+ _gat._getTrackerByName()._trackEvent(category, action);
+ setTimeout('document.location = "' + link.href + '"', 100);
+ }
</script>
</head>
+
<body>
<div class="scrollblock block-title">
<h1>git - prosty przewodnik</h1>
- <p>Prosty przewodnik dla początkujących. nic skomplikowanego ;)</p>
- <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>
- <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>
+ <p>Prosty przewodnik dla początkujących. nic skomplikowanego ;)</p>
+ <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>
+ <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>
<p class="meta">
by <a href="http://www.twitter.com/rogerdudler">Roger Dudler</a>
- <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 />
+ <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 />
this guide in
<a href="index.html">english</a>,
<a href="index.de.html">deutsch</a>,
@@ -43,7 +60,7 @@ <h1>git - prosty przewodnik</h1>
<a href="index.pt_BR.html">português</a>,
<a href="index.ru.html">русский</a>,
<a href="index.tr.html">türkçe</a>,
- <br/>
+ <br />
<a href="index.my.html">မြန်မာ</a>,
<a href="index.ja.html">日本語</a>,
<a href="index.zh.html">中文</a>,
@@ -59,9 +76,8 @@ <h1>git - prosty przewodnik</h1>
<div class="scrollblock block-setup">
<h2>Instalacja</h2>
<p>
- <a
- href="http://git-scm.com/download/mac">Pobierz
- git dla OSX</a>
+ <a href="http://git-scm.com/download/mac">Pobierz
+ git dla OSX</a>
</p>
<p>
<a href="http://msysgit.github.io/">Pobierz git dla Windows</a>
@@ -289,15 +305,22 @@ <h2>komentarze</h2>
var disqus_shortname = 'git-the-simple-guide'; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */
- (function() {
- var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+ (function () {
+ var dsq = document.createElement('script');
+ dsq.type = 'text/javascript';
+ dsq.async = true;
dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
- (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(
+ dsq);
})();
</script>
- <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+ <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by
+ Disqus.</a></noscript>
</div>
- <a href="http://www.git-tower.com/?source=rd" onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
- <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;" class="cheatsheet"></a>
+ <a href="http://www.git-tower.com/?source=rd"
+ onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
+ <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;"
+ class="cheatsheet"></a>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/index.pt_BR.html b/index.pt_BR.html
index a421b0dd..dde13fe8 100644
--- a/index.pt_BR.html
+++ b/index.pt_BR.html
@@ -1,38 +1,55 @@
<!DOCTYPE html>
<html lang="en">
+
<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title>git - guia prático - sem complicação!</title>
- <link href='http://fonts.googleapis.com/css?family=Chelsea+Market' rel='stylesheet' type='text/css'>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <title>git - guia prático - sem complicação!</title>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/normalize/0/normalize.min.css" type="text/css">
- <link rel="stylesheet" href="css/style.css" type="text/css">
+ <link rel="stylesheet" href="css/style.css" type="text/css">
<script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-652147-13']);
- _gaq.push(['_trackPageview']);
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-652147-13']);
+ _gaq.push(['_trackPageview']);
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
+ (function () {
+ var ga = document.createElement('script');
+ ga.type = 'text/javascript';
+ ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') +
+ '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(ga, s);
+ })();
- function recordOutboundLink(link, category, action) {
- _gat._getTrackerByName()._trackEvent(category, action);
- setTimeout('document.location = "' + link.href + '"', 100);
- }
+ function recordOutboundLink(link, category, action) {
+ _gat._getTrackerByName()._trackEvent(category, action);
+ setTimeout('document.location = "' + link.href + '"', 100);
+ }
</script>
</head>
+
<body>
<div class="scrollblock block-title">
<h1>git - guia prático</h1>
<p>apenas um guia prático para começar com git. sem complicação ;)</p>
- <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>
- <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>
+ <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>
+ <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>
<p class="meta">
por <a href="http://www.twitter.com/rogerdudler">Roger Dudler</a>
- <br />créditos para <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 />
+ <br />créditos para <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 />
guia em
<a href="index.html">english</a>,
<a href="index.de.html">deutsch</a>,
@@ -44,7 +61,7 @@ <h1>git - guia prático</h1>
<a href="index.pl.html">polski</a>,
<a href="index.ru.html">русский</a>,
<a href="index.tr.html">türkçe</a>,
- <br/>
+ <br />
<a href="index.my.html">မြန်မာ</a>,
<a href="index.ja.html">日本語</a>,
<a href="index.zh.html">中文</a>,
@@ -94,7 +111,8 @@ <h2>fluxo de trabalho</h2>
seus repositórios locais consistem em três "árvores" mantidas pelo git.
a primeira delas é sua <code>Working Directory</code> que contém os arquivos vigentes.
a segunda <code>Index</code> que funciona como uma área temporária e
- finalmente a <code>HEAD</code> que aponta para o último <i>commit</i> (confirmação) que você fez.
+ finalmente a <code>HEAD</code> que aponta para o último <i>commit</i> (confirmação) que
+ você fez.
</p>
<img src="img/trees.png" alt="" />
</div>
@@ -105,7 +123,8 @@ <h2>adicionar & confirmar</h2>
Você pode propor mudanças (adicioná-las ao <b>Index</b>) usando<br />
<code>git add <arquivo></code><br />
<code>git add *</code><br />
- Este é o primeiro passo no fluxo de trabalho básico do git. Para realmente confirmar estas mudanças (isto é, fazer um <i>commit</i>), use<br />
+ Este é o primeiro passo no fluxo de trabalho básico do git. Para realmente confirmar estas
+ mudanças (isto é, fazer um <i>commit</i>), use<br />
<code>git commit -m "comentários das alterações"</code><br />
Agora o arquivo é enviado para o <b>HEAD</b>, mas ainda não para o repositório remoto.
</p>
@@ -114,13 +133,17 @@ <h2>adicionar & confirmar</h2>
<div class="scrollblock block-remote">
<h2>enviando alterações</h2>
<p>
- Suas alterações agora estão no <b>HEAD</b> da sua cópia de trabalho local. Para enviar estas alterações ao seu repositório remoto, execute <br />
+ Suas alterações agora estão no <b>HEAD</b> da sua cópia de trabalho local. Para
+ enviar estas alterações ao seu repositório remoto, execute <br />
<code>git push origin master</code><br />
- Altere <i>master</i> para qualquer ramo (<i>branch</i>) desejado, enviando suas alterações para ele.
+ Altere <i>master</i> para qualquer ramo (<i>branch</i>) desejado, enviando suas alterações
+ para ele.
<br /><br />
- Se você não clonou um repositório existente e quer conectar seu repositório a um servidor remoto, você deve adicioná-lo com<br />
+ Se você não clonou um repositório existente e quer conectar seu repositório a um
+ servidor remoto, você deve adicioná-lo com<br />
<code>git remote add origin <servidor></code><br />
- Agora você é capaz de enviar suas alterações para o servidor remoto selecionado.<br />
+ Agora você é capaz de enviar suas alterações para o servidor remoto
+ selecionado.<br />
</p>
</div>
@@ -128,7 +151,9 @@ <h2>enviando alterações</h2>
<div class="scrollblock block-branching">
<h2>ramificando</h2>
<p>
- <i>Branches</i> ("ramos") são utilizados para desenvolver funcionalidades isoladas umas das outras. O branch <i>master</i> é o branch "padrão" quando você cria um repositório. Use outros branches para desenvolver e mescle-os (<i>merge</i>) ao branch master após a conclusão.
+ <i>Branches</i> ("ramos") são utilizados para desenvolver funcionalidades isoladas umas das outras. O
+ branch <i>master</i> é o branch "padrão" quando você cria um repositório. Use
+ outros branches para desenvolver e mescle-os (<i>merge</i>) ao branch master após a conclusão.
</p>
<img src="img/branches.png" alt="" />
<p>
@@ -138,7 +163,8 @@ <h2>ramificando</h2>
<code>git checkout master</code><br />
e remova o branch da seguinte forma<br />
<code>git branch -d funcionalidade_x</code><br />
- um branch <i> não está disponível a outros</i> a menos que você envie o branch para seu repositório remoto<br />
+ um branch <i> não está disponível a outros</i> a menos que você envie o branch
+ para seu repositório remoto<br />
<code>git push origin <funcionalidade_x></code>
</p>
</div>
@@ -148,14 +174,18 @@ <h2>atualizar & mesclar</h2>
<p>
para atualizar seu repositório local com a mais nova versão, execute <br />
<code>git pull</code><br />
- na sua pasta de trabalho para <i>obter</i> e <i>fazer merge</i> (mesclar) alterações remotas.<br />
+ na sua pasta de trabalho para <i>obter</i> e <i>fazer merge</i> (mesclar) alterações
+ remotas.<br />
para fazer merge de um outro branch ao seu branch ativo (ex. master), use<br />
<code>git merge <branch></code><br />
- em ambos os casos o git tenta fazer o merge das alterações automaticamente. Infelizmente, isto nem sempre é possível e resulta em <i>conflitos</i>.
+ em ambos os casos o git tenta fazer o merge das alterações automaticamente. Infelizmente, isto
+ nem sempre é possível e resulta em <i>conflitos</i>.
Você é responsável por fazer o merge estes <i>conflitos</i>
- manualmente editando os arquivos exibidos pelo git. Depois de alterar, você precisa marcá-los como merged com<br />
+ manualmente editando os arquivos exibidos pelo git. Depois de alterar, você precisa marcá-los
+ como merged com<br />
<code>git add <arquivo></code><br />
- antes de fazer o merge das alterações, você pode também pré-visualizá-as usando<br />
+ antes de fazer o merge das alterações, você pode também
+ pré-visualizá-as usando<br />
<code>git diff <branch origem> <branch destino></code>
</p>
</div>
@@ -163,9 +193,12 @@ <h2>atualizar & mesclar</h2>
<div class="scrollblock block-tagging">
<h2>rotulando</h2>
<p>
- é recomendado criar rótulos para releases de software. Este é um conhecido conceito, que também existe no SVN. Você pode criar um novo rótulo chamado <i>1.0.0</i> executando o comando<br />
+ é recomendado criar rótulos para releases de software. Este é um conhecido conceito,
+ que também existe no SVN. Você pode criar um novo rótulo chamado <i>1.0.0</i> executando
+ o comando<br />
<code>git tag 1.0.0 1b2e1d63ff</code><br />
- o <i>1b2e1d63ff</i> representa os 10 primeiros caracteres do id de commit que você quer referenciar com seu rótulo. Você pode obter o id de commit com <br />
+ o <i>1b2e1d63ff</i> representa os 10 primeiros caracteres do id de commit que você quer referenciar
+ com seu rótulo. Você pode obter o id de commit com <br />
<code>git log</code><br />
você pode também usar menos caracteres do id de commit, ele somente precisa ser único.
</p>
@@ -174,12 +207,16 @@ <h2>rotulando</h2>
<div class="scrollblock block-checkout-replace">
<h2>sobrescrever alterações locais</h2>
<p>
- No caso de você ter feito algo errado (que seguramente nunca acontece ;) ) você pode sobrescrever as alterações locais usando o commando<br />
+ No caso de você ter feito algo errado (que seguramente nunca acontece ;) ) você pode
+ sobrescrever as alterações locais usando o commando<br />
<code>git checkout -- <arquivo></code><br />
- isto substitui as alterações na sua árvore de trabalho com o conteúdo mais recente no HEAD. Alterações já adicionadas ao index, bem como novos arquivos serão mantidos.
+ isto substitui as alterações na sua árvore de trabalho com o conteúdo mais
+ recente no HEAD. Alterações já adicionadas ao index, bem como novos arquivos
+ serão mantidos.
</p>
<p>
- Se ao invés disso você deseja remover todas as alterações e commits locais, recupere o histórico mais recente do servidor e aponte para seu branch master local desta forma<br />
+ Se ao invés disso você deseja remover todas as alterações e commits locais,
+ recupere o histórico mais recente do servidor e aponte para seu branch master local desta forma<br />
<code>git fetch origin</code><br />
<code>git reset --hard origin/master</code>
</p>
@@ -224,7 +261,8 @@ <h3>guias</h3>
</div>
<div class="announcement">
<a href="http://frontify.com/?utm_source=gitguide&utm_campaign=founder">
- <img src="http://d13bhd1byokz0o.cloudfront.net/ad/clarify-announcement-git@2x.png" width="960" height="100" alt="Clarify" />
+ <img src="http://d13bhd1byokz0o.cloudfront.net/ad/clarify-announcement-git@2x.png" width="960" height="100"
+ alt="Clarify" />
</a>
</div>
<a name="comments"></a>
@@ -236,15 +274,22 @@ <h2>comentários</h2>
var disqus_shortname = 'git-the-simple-guide'; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */
- (function() {
- var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+ (function () {
+ var dsq = document.createElement('script');
+ dsq.type = 'text/javascript';
+ dsq.async = true;
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
- (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(
+ dsq);
})();
</script>
- <noscript>Por favor habilite o JavaScript para ver os <a href="http://disqus.com/?ref_noscript">comentários powered by Disqus.</a></noscript>
+ <noscript>Por favor habilite o JavaScript para ver os <a
+ href="http://disqus.com/?ref_noscript">comentários powered by Disqus.</a></noscript>
</div>
- <a href="http://www.git-tower.com/?source=rd" onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
- <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;" class="cheatsheet"></a>
+ <a href="http://www.git-tower.com/?source=rd"
+ onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
+ <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;"
+ class="cheatsheet"></a>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/index.ru.html b/index.ru.html
index 545b1977..1f390aa9 100644
--- a/index.ru.html
+++ b/index.ru.html
@@ -1,38 +1,56 @@
<!DOCTYPE html>
<html lang="ru">
+
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>git - the simple guide - no deep shit!</title>
- <link href='http://fonts.googleapis.com/css?family=Chelsea+Market' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/normalize/0/normalize.min.css" type="text/css">
<link rel="stylesheet" href="css/style.css" type="text/css">
<script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-652147-13']);
- _gaq.push(['_trackPageview']);
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-652147-13']);
+ _gaq.push(['_trackPageview']);
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
+ (function () {
+ var ga = document.createElement('script');
+ ga.type = 'text/javascript';
+ ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') +
+ '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(ga, s);
+ })();
- function recordOutboundLink(link, category, action) {
- _gat._getTrackerByName()._trackEvent(category, action);
- setTimeout('document.location = "' + link.href + '"', 100);
- }
+ function recordOutboundLink(link, category, action) {
+ _gat._getTrackerByName()._trackEvent(category, action);
+ setTimeout('document.location = "' + link.href + '"', 100);
+ }
</script>
</head>
-<body>
+
+<body style="font-family: Georgia, Times New Roman, Times, serif;">
<div class="scrollblock block-title">
<h1>git - the simple guide</h1>
<p>простое руководство по работе с git. Ничего сложного ;)</p>
- <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>
- <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>
+ <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>
+ <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>
<p class="meta">
- <a href="http://www.twitter.com/rogerdudler">Роджер Дадлер</a> (перевел <a href="http://dmitrywolf.com">Дмитрий Вольф</a>)
- <br />спасибо <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 />
+ <a href="http://www.twitter.com/rogerdudler">Роджер Дадлер</a> (перевел <a
+ href="http://dmitrywolf.com">Дмитрий Вольф</a>)
+ <br />спасибо <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 />
это руководство на
<a href="index.html">english</a>,
<a href="index.de.html">deutsch</a>,
@@ -44,7 +62,7 @@ <h1>git - the simple guide</h1>
<a href="index.pl.html">polski</a>,
<a href="index.pt_BR.html">português</a>,
<a href="index.tr.html">türkçe</a>,
- <br/>
+ <br />
<a href="index.my.html">မြန်မာ</a>,
<a href="index.ja.html">日本語</a>,
<a href="index.zh.html">中文</a>,
@@ -73,7 +91,7 @@ <h2>установка</h2>
<h2>создание нового репозитория</h2>
<p>
Для того чтобы создать новый репозиторий git, необходимо
- открыть папку где вы хотите его разместить и выполнить команду<br />
+ открыть папку где вы хотите его разместить и выполнить команду<br />
<code>git init</code><br />
</p>
@@ -90,13 +108,13 @@ <h2>получение репозитория</h2>
</div>
<a name="trees"></a>
<div class="scrollblock block-trees">
- <h2>рабочий процесс</h2>
+ <h2>рабочий процесс</h2>
<p>
Ваш локальный git репозиторий состоит из трех "сущностей".
<code>Рабочий каталог</code> (Working Directory) содержит файлы.
<code>Индекс</code> (Index) или область подготовленных файлов (Staging Area)</code>,
- содержит информацию о том, что должно войти в следующий коммит и
- <code>HEAD</code> указывает на последний коммит что вы сделали.
+ содержит информацию о том, что должно войти в следующий коммит и
+ <code>HEAD</code> указывает на последний коммит что вы сделали.
</p>
<img src="img/trees.png" alt="" />
</div>
@@ -109,7 +127,8 @@ <h2>Подготовка и коммит</h2>
<code>git add *</code><br />
Это первый шаг в основном рабочем процессе. Сделать коммит подготовленных изменений можно командой<br />
<code>git commit -m "Описание коммита"</code><br />
- Теперь изменения закреплены в локальном репозитории, и на них указывает <b>HEAD</b>, но еще не в удаленном репозитории.
+ Теперь изменения закреплены в локальном репозитории, и на них указывает <b>HEAD</b>, но еще не в удаленном
+ репозитории.
</p>
</div>
<a name="push"></a>
@@ -120,7 +139,8 @@ <h2>отправка изменений</h2>
<code>git push origin master</code><br />
Можно изменить <i>master</i> на любую другую ветвь, чтобы отправить изменения на неё.
<br /><br />
- Если вы еще не клонировали существующий репозиторий и хотите подключить ваш к удаленному, вам нужно добавить его, выполнив<br />
+ Если вы еще не клонировали существующий репозиторий и хотите подключить ваш к удаленному, вам нужно добавить
+ его, выполнив<br />
<code>git remote add origin <адрес_сервера></code><br />
Теперь вы можете отправлять изменения на удаленный репозиторий<br />
@@ -130,8 +150,9 @@ <h2>отправка изменений</h2>
<div class="scrollblock block-branching">
<h2>ветвление</h2>
<p>
- Ветки используются для разработки функциональности, изолированной от остальной. Ветка <i>master</i> используется по умолчанию, когда вы создаете репозиторий.
- Используйте другие ветки для разработки и слияние в <i>master</i>, когда разработка завершена.
+ Ветки используются для разработки функциональности, изолированной от остальной. Ветка <i>master</i>
+ используется по умолчанию, когда вы создаете репозиторий.
+ Используйте другие ветки для разработки и слияние в <i>master</i>, когда разработка завершена.
</p>
<img src="img/branches.png" alt="" />
<p>
@@ -141,20 +162,22 @@ <h2>ветвление</h2>
<code>git checkout master</code><br />
удалить ветку<br />
<code>git branch -d feature_x</code><br />
- ветка не будет доступна тем, кто пользуется с вами удаленным репозиторием, пока вы не отправите её туда<br />
+ ветка не будет доступна тем, кто пользуется с вами удаленным репозиторием, пока вы не отправите её
+ туда<br />
<code>git push origin <имя_ветки></code>
</p>
</div>
<a name="update"></a>
<div class="scrollblock block-merging">
- <h2>обновление и слияние</h2>
+ <h2>обновление и слияние</h2>
<p>
Обновить ваш локальный репозиторий можно командой<br />
<code>git pull</code><br />
которая заберет изменения из удаленного репозитория и проведет слияние с активной веткой.<br />
Для того чтобы слить другую ветку с активной (например master), используйте команду<br />
<code>git merge <имя_ветки></code><br />
- В обоих случаях git пытается автоматически слить изменения. К сожалению, это не всегда возможно и результатом станет <i>конфликт</i>.
+ В обоих случаях git пытается автоматически слить изменения. К сожалению, это не всегда возможно и
+ результатом станет <i>конфликт</i>.
Вы ответственны за разрешение возникших <i>конфликтов</i>,
путем ручного редактирования файлов, указанных git. После изменений вам надо пометить их как слитые<br />
<code>git add <имя_файла></code><br />
@@ -164,32 +187,37 @@ <h2>обновление и слияние</h2>
</div>
<a name="tagging"></a>
<div class="scrollblock block-tagging">
- <h2>метки</h2>
+ <h2>метки</h2>
<p>
- Рекомендуется использовать метки для закрепления момента выпуска версий. Это популярная практика, которая также используется в SVN. Создать новую метку с именем <i>1.0.0</i> можно, выполнив<br />
+ Рекомендуется использовать метки для закрепления момента выпуска версий. Это популярная практика, которая
+ также используется в SVN. Создать новую метку с именем <i>1.0.0</i> можно, выполнив<br />
<code>git tag 1.0.0 1b2e1d63ff</code><br />
- <i>1b2e1d63ff</i> это первые десять цифр уникального идентификатора (id), с которым будет связана метка. Чтобы посмотреть идентификаторы коммитов, выполните <br />
+ <i>1b2e1d63ff</i> это первые десять цифр уникального идентификатора (id), с которым будет связана метка.
+ Чтобы посмотреть идентификаторы коммитов, выполните <br />
<code>git log</code><br />
- Можно использовать меньшее количество символов в качестве идентификатора, с учетом того, что он является уникальным.
+ Можно использовать меньшее количество символов в качестве идентификатора, с учетом того, что он является
+ уникальным.
</p>
</div>
<a name="checkout-replace"></a>
<div class="scrollblock block-checkout-replace">
- <h2>замена локальных изменений</h2>
+ <h2>замена локальных изменений</h2>
<p>
В случае, если вы сделали что-то не то, вы можете заменить локальные изменения, используя команду<br />
<code>git checkout -- <имя_файла></code><br />
- произойдет замена изменений в вашем рабочем каталоге, на то, что сейчас находится в HEAD. Изменения, уже внесенные в индекс, также как и новые файлы, будут сохранены.
+ произойдет замена изменений в вашем рабочем каталоге, на то, что сейчас находится в HEAD. Изменения, уже
+ внесенные в индекс, также как и новые файлы, будут сохранены.
</p>
<p>
- Если же вы хотите удалить все ваши локальные изменения и коммиты, получите (fetch) последние изменения с сервера и укажите локальной ветке master на них вот так<br />
+ Если же вы хотите удалить все ваши локальные изменения и коммиты, получите (fetch) последние изменения с
+ сервера и укажите локальной ветке master на них вот так<br />
<code>git fetch origin</code><br />
<code>git reset --hard origin/master</code>
</p>
</div>
<a name="hints"></a>
<div class="scrollblock block-hints">
- <h2>твики и удобные команды</h2>
+ <h2>твики и удобные команды</h2>
<p>
встроенный в git графический интерфейс<br />
<code>gitk</code><br />
@@ -227,7 +255,8 @@ <h3>руководства</h3>
</div>
<div class="announcement">
<a href="http://frontify.com/?utm_source=gitguide&utm_campaign=founder">
- <img src="http://d13bhd1byokz0o.cloudfront.net/ad/clarify-announcement-git@2x.png" width="960" height="100" alt="Clarify" />
+ <img src="http://d13bhd1byokz0o.cloudfront.net/ad/clarify-announcement-git@2x.png" width="960" height="100"
+ alt="Clarify" />
</a>
</div>
<a name="comments"></a>
@@ -239,15 +268,22 @@ <h2>комментарии</h2>
var disqus_shortname = 'git-the-simple-guide'; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */
- (function() {
- var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+ (function () {
+ var dsq = document.createElement('script');
+ dsq.type = 'text/javascript';
+ dsq.async = true;
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
- (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(
+ dsq);
})();
</script>
- <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+ <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by
+ Disqus.</a></noscript>
</div>
- <a href="http://www.git-tower.com/?source=rd" onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
- <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;" class="cheatsheet"></a>
+ <a href="http://www.git-tower.com/?source=rd"
+ onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
+ <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;"
+ class="cheatsheet"></a>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/index.tr.html b/index.tr.html
index 436a7a44..78c31704 100644
--- a/index.tr.html
+++ b/index.tr.html
@@ -1,38 +1,55 @@
<!DOCTYPE html>
<html lang="tr">
+
<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title>git - basit rehber - atla deve değil!</title>
- <link href='http://fonts.googleapis.com/css?family=Chelsea+Market' rel='stylesheet' type='text/css'>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <title>git - basit rehber - atla deve değil!</title>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/normalize/0/normalize.min.css" type="text/css">
- <link rel="stylesheet" href="css/style.css" type="text/css">
+ <link rel="stylesheet" href="css/style.css" type="text/css">
<script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-652147-13']);
- _gaq.push(['_trackPageview']);
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-652147-13']);
+ _gaq.push(['_trackPageview']);
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
+ (function () {
+ var ga = document.createElement('script');
+ ga.type = 'text/javascript';
+ ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') +
+ '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(ga, s);
+ })();
- function recordOutboundLink(link, category, action) {
- _gat._getTrackerByName()._trackEvent(category, action);
- setTimeout('document.location = "' + link.href + '"', 100);
- }
+ function recordOutboundLink(link, category, action) {
+ _gat._getTrackerByName()._trackEvent(category, action);
+ setTimeout('document.location = "' + link.href + '"', 100);
+ }
</script>
</head>
+
<body>
<div class="scrollblock block-title">
<h1>git - basit rehber</h1>
<p>git'e başlamak için basit bir rehber. atla deve değil ;)</p>
- <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>
- <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>
+ <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>
+ <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>
<p class="meta">
by <a href="http://www.twitter.com/rogerdudler">Roger Dudler</a>
- <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 />
+ <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 />
this guide in
<a href="index.html">english</a>,
<a href="index.de.html">deutsch</a>,
@@ -44,7 +61,7 @@ <h1>git - basit rehber</h1>
<a href="index.pl.html">polski</a>,
<a href="index.pt_BR.html">português</a>,
<a href="index.ru.html">русский</a>,
- <br/>
+ <br />
<a href="index.my.html">မြန်မာ</a>,
<a href="index.ja.html">日本語</a>,
<a href="index.zh.html">中文</a>,
@@ -114,7 +131,8 @@ <h2>ekleme & teslim</h2>
<div class="scrollblock block-remote">
<h2>değişiklikleri göndermek</h2>
<p>
- Şimdi değişiklikleriniz yerel deponuzun <b>HEAD</b>'i içerisinde.<br /> Bu değişiklikleri uzak deponuza göndermek için,<br />
+ Şimdi değişiklikleriniz yerel deponuzun <b>HEAD</b>'i içerisinde.<br /> Bu değişiklikleri uzak deponuza
+ göndermek için,<br />
<code>git push origin master</code><br />
Değişiklikleri uzak deponuzdaki göndermek istediğiniz dal'ı <i>master</i> ile değiştirin.
<br /><br />
@@ -128,7 +146,8 @@ <h2>değişiklikleri göndermek</h2>
<div class="scrollblock block-branching">
<h2>dallar ile çalışmak</h2>
<p>
- Dallar farklı özellikleri ayrı ayrı geliştirmek için kullanılır. Yeni bir depo oluşturduğunuzda <i>master</i> "varsayılan" daldır. Diğer dallar geliştirildikten sonra <i>master</i>'a birleştirilir.
+ Dallar farklı özellikleri ayrı ayrı geliştirmek için kullanılır. Yeni bir depo oluşturduğunuzda
+ <i>master</i> "varsayılan" daldır. Diğer dallar geliştirildikten sonra <i>master</i>'a birleştirilir.
</p>
<img src="img/branches.png" alt="" />
<p>
@@ -148,7 +167,7 @@ <h2>güncelleme & birleştirme</h2>
<p>
en son değişiklikleri (commit) yerel deponuza almak için<br />
<code>git pull</code><br />
- komutunu çalıştırın. Bu değişiklikleri al <i>(fetch)</i> ve birleştir <i>(merge)</i> yapacaktır.
+ komutunu çalıştırın. Bu değişiklikleri al <i>(fetch)</i> ve birleştir <i>(merge)</i> yapacaktır.
Aktif dala (örn. master) başka bir dalı birleştirmek için <br />
<code>git merge <dal></code><br />
her iki durumda da git değişiklikleri otomatik birleştirmeyi (auto-merge) dener.
@@ -165,9 +184,11 @@ <h2>güncelleme & birleştirme</h2>
<div class="scrollblock block-tagging">
<h2>sürümlemek</h2>
<p>
- yazılım sürümleriniz için sürüm adı (tag) oluşturmanız tavsiye edilir. bu SVN'de de mevcut olan bilindik bir kavramdır. <i>1.0.0</i> adıyla bir sürüm numarası (tag) oluşturmak için<br />
+ yazılım sürümleriniz için sürüm adı (tag) oluşturmanız tavsiye edilir. bu SVN'de de mevcut olan bilindik bir
+ kavramdır. <i>1.0.0</i> adıyla bir sürüm numarası (tag) oluşturmak için<br />
<code>git tag 1.0.0 1b2e1d63ff</code><br />
- buradaki <i>1b2e1d63ff</i> yayımlanacak yazılım sürümünüzün işlem numarasının ilk 10 karakteridir. İşlem kimlik numaralarını görmek için<br />
+ buradaki <i>1b2e1d63ff</i> yayımlanacak yazılım sürümünüzün işlem numarasının ilk 10 karakteridir. İşlem
+ kimlik numaralarını görmek için<br />
<code>git log</code><br />
tekil olduğu sürece daha az işlem numarası da kullanabilirsiniz.
</p>
@@ -176,12 +197,15 @@ <h2>sürümlemek</h2>
<div class="scrollblock block-checkout-replace">
<h2>yerel değişiklikleri geri almak</h2>
<p>
- Yanlış birşey yapmanız durumunda (tabi ki böyle şeyler hiç olmaz ;)) yerel değişiklikleri geri almak için<br />
+ Yanlış birşey yapmanız durumunda (tabi ki böyle şeyler hiç olmaz ;)) yerel değişiklikleri geri almak
+ için<br />
<code>git checkout -- <dosyaadı></code><br />
- bu değişikliklerinizi HEAD içerisindeki son içerik ile değiştirir. Index'e önceden eklenmiş değişiklikler ve yeni dosyalar korunacaktır.
+ bu değişikliklerinizi HEAD içerisindeki son içerik ile değiştirir. Index'e önceden eklenmiş değişiklikler ve
+ yeni dosyalar korunacaktır.
</p>
<p>
- Eğer tüm yerel değişiklik ve teslimlerinizi iptal etmek istiyorsanız, sunucudan en son kayıtları getirin ve yerel master dalınıza gösterin<br />
+ Eğer tüm yerel değişiklik ve teslimlerinizi iptal etmek istiyorsanız, sunucudan en son kayıtları getirin ve
+ yerel master dalınıza gösterin<br />
<code>git fetch origin</code><br />
<code>git reset --hard origin/master</code>
</p>
@@ -226,7 +250,8 @@ <h3>rehberler</h3>
</div>
<div class="announcement">
<a href="http://frontify.com/?utm_source=gitguide&utm_campaign=founder">
- <img src="http://d13bhd1byokz0o.cloudfront.net/ad/clarify-announcement-git@2x.png" width="960" height="100" alt="Clarify" />
+ <img src="http://d13bhd1byokz0o.cloudfront.net/ad/clarify-announcement-git@2x.png" width="960" height="100"
+ alt="Clarify" />
</a>
</div>
<a name="comments"></a>
@@ -238,15 +263,22 @@ <h2>yorumlar</h2>
var disqus_shortname = 'git-the-simple-guide'; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */
- (function() {
- var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+ (function () {
+ var dsq = document.createElement('script');
+ dsq.type = 'text/javascript';
+ dsq.async = true;
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
- (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(
+ dsq);
})();
</script>
- <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+ <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by
+ Disqus.</a></noscript>
</div>
- <a href="http://www.git-tower.com/?source=rd" onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
- <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;" class="cheatsheet"></a>
+ <a href="http://www.git-tower.com/?source=rd"
+ onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
+ <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;"
+ class="cheatsheet"></a>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/index.vi.html b/index.vi.html
index 498b9ed9..3bada55d 100644
--- a/index.vi.html
+++ b/index.vi.html
@@ -1,38 +1,55 @@
<!DOCTYPE html>
<html lang="en">
+
<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title>git - hướng dẫn đơn giản</title>
- <link href='http://fonts.googleapis.com/css?family=Chelsea+Market' rel='stylesheet' type='text/css'>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <title>git - hướng dẫn đơn giản</title>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/normalize/0/normalize.min.css" type="text/css">
- <link rel="stylesheet" href="css/style.css" type="text/css">
+ <link rel="stylesheet" href="css/style.css" type="text/css">
<script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-652147-13']);
- _gaq.push(['_trackPageview']);
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-652147-13']);
+ _gaq.push(['_trackPageview']);
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
+ (function () {
+ var ga = document.createElement('script');
+ ga.type = 'text/javascript';
+ ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') +
+ '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(ga, s);
+ })();
- function recordOutboundLink(link, category, action) {
- _gat._getTrackerByName()._trackEvent(category, action);
- setTimeout('document.location = "' + link.href + '"', 100);
- }
+ function recordOutboundLink(link, category, action) {
+ _gat._getTrackerByName()._trackEvent(category, action);
+ setTimeout('document.location = "' + link.href + '"', 100);
+ }
</script>
</head>
+
<body>
<div class="scrollblock block-title">
<h1>Sổ tay Git</h1>
<p>Đây là một hướng dẫn đơn giản cho người mới học ;)</p>
- <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>
- <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>
+ <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>
+ <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>
<p class="meta">
by <a href="http://www.twitter.com/rogerdudler">Roger Dudler</a>
- <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 />
+ <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 />
this guide in
<a href="index.de.html">deutsch</a>,
<a href="index.es.html">español</a>,
@@ -44,7 +61,7 @@ <h1>Sổ tay Git</h1>
<a href="index.pt_BR.html">português</a>,
<a href="index.ru.html">русский</a>,
<a href="index.tr.html">türkçe</a>,
- <br/>
+ <br />
<a href="index.my.html">မြန်မာ</a>,
<a href="index.ja.html">日本語</a>,
<a href="index.zh.html">中文</a>,
@@ -114,11 +131,13 @@ <h2>thêm (add) & commit</h2>
<div class="scrollblock block-remote">
<h2>đẩy (push) các thay đổi</h2>
<p>
- Thay đổi của bạn hiện đang nằm tại <b>HEAD</b> của bản sao cục bộ đang làm việc. Để gửi những thay đổi đó đến repository remote, bạn thực thi<br />
+ Thay đổi của bạn hiện đang nằm tại <b>HEAD</b> của bản sao cục bộ đang làm việc. Để gửi những thay đổi đó
+ đến repository remote, bạn thực thi<br />
<code>git push origin master</code><br />
Thay đổi <i>master</i> bằng bất cứ nhánh nào mà bạn muốn đầy những thay đổi đến.
<br /><br />
- Nếu bạn chưa clone một repository hiện có và muốn kết nối repository của bạn đến máy chủ remote, bạn phải thêm nó với<br />
+ Nếu bạn chưa clone một repository hiện có và muốn kết nối repository của bạn đến máy chủ remote, bạn phải
+ thêm nó với<br />
<code>git remote add origin <máy-chủ></code><br />
Bây giờ bạn đã có thể đẩy các thay đổi của mình vào máy chủ đã chọn<br />
@@ -128,7 +147,9 @@ <h2>đẩy (push) các thay đổi</h2>
<div class="scrollblock block-branching">
<h2>nhánh</h2>
<p>
- Các nhánh (branches) được dùng để phát triển tính năng tách riêng ra từ những nhánh khác. Nhánh <i>master</i> là nhánh "mặc định" khi bạn tạo một repository. Sử dụng các nhánh khác tri đang trong giai đoạn phát triển và merge trở lại nhánh master một khi đã hoàn tất.
+ Các nhánh (branches) được dùng để phát triển tính năng tách riêng ra từ những nhánh khác. Nhánh
+ <i>master</i> là nhánh "mặc định" khi bạn tạo một repository. Sử dụng các nhánh khác tri đang trong giai
+ đoạn phát triển và merge trở lại nhánh master một khi đã hoàn tất.
</p>
<img src="img/branches.png" alt="" />
<p>
@@ -151,9 +172,11 @@ <h2>cập nhật & trộn (update & merge)</h2>
trong thự mục đang làm việc để <i>lấy về (fetch)</i> và <i>trộn (merge)</i> các thay đổi ở remote.<br />
để trộn một nhánh khác vào nhánh đang hoạt động (vd: master), sử dụng<br />
<code>git merge <nhánh></code><br />
- trong cả hai trường hợp, git cố gắng trộn tự động (auto-merge) các thay đổi. Không may, điều này không phải lúc nào cũng làm được và thường dẫn đến <i>xung đột</i>.
+ trong cả hai trường hợp, git cố gắng trộn tự động (auto-merge) các thay đổi. Không may, điều này không phải
+ lúc nào cũng làm được và thường dẫn đến <i>xung đột</i>.
Trách nhiệm của bạn là trộn <i>các xung đột</i> đó
- thủ công bằng cách chỉnh sửa các tập tin được hiển thị bởi git. Sau khi thay đổi, bạn phải đánh dấu chúng là đã được trộn (merged) với lệnh<br />
+ thủ công bằng cách chỉnh sửa các tập tin được hiển thị bởi git. Sau khi thay đổi, bạn phải đánh dấu chúng là
+ đã được trộn (merged) với lệnh<br />
<code>git add <tên-tập-tin></code><br />
trước khi trộn các thay đổi, bạn có thể xem trước chúng bằng các<br />
<code>git diff <nhánh_nguồn> <nhánh_mục_tiêu></code>
@@ -163,9 +186,11 @@ <h2>cập nhật & trộn (update & merge)</h2>
<div class="scrollblock block-tagging">
<h2>gắn nhãn (tagging)</h2>
<p>
- người ta khuyên nên tạo nhãn (tags) khi phát hành phần mềm. đây là khái niệm được biết đến, đã từng có trên SVN. Bạn tạo tag mới tên là <i>1.0.0</i> bằng cách<br />
+ người ta khuyên nên tạo nhãn (tags) khi phát hành phần mềm. đây là khái niệm được biết đến, đã từng có trên
+ SVN. Bạn tạo tag mới tên là <i>1.0.0</i> bằng cách<br />
<code>git tag 1.0.0 1b2e1d63ff</code><br />
- chuỗi <i>1b2e1d63ff</i> là 10 ký tự đầu tiên của mã commit (commit id) mà bạn muốn tham chiếu đến bằng nhãn của bạn. Bạn có thể lấy mã commit với lệnh <br />
+ chuỗi <i>1b2e1d63ff</i> là 10 ký tự đầu tiên của mã commit (commit id) mà bạn muốn tham chiếu đến bằng nhãn
+ của bạn. Bạn có thể lấy mã commit với lệnh <br />
<code>git log</code><br />
bạn cũng có thể sử dụng ít ký tự hơn từ mã commit, nó chỉ cần phải là duy nhất.
</p>
@@ -176,10 +201,12 @@ <h2>thay thế các thay đổi cục bộ</h2>
<p>
Trong trường hợp bạn làm sai điều gì đó, bạn có thể thay thế các thay đổi cục bộ bằng lệnh<br />
<code>git checkout -- <tên-tập-tin></code><br />
- lệnh này thay thế những thay đổi trong "tree" đang làm việc với nội dung mới nhất của HEAD. Các thay đổi đã được thêm vào chỉ mục, kể cả các tập tin mới, điều này sẽ được giữ lại.
+ lệnh này thay thế những thay đổi trong "tree" đang làm việc với nội dung mới nhất của HEAD. Các thay đổi đã
+ được thêm vào chỉ mục, kể cả các tập tin mới, điều này sẽ được giữ lại.
</p>
<p>
- Nếu bạn muốn hủy tất cả thay đổi và commit cục bộ, lấy về (fetch) lịch sử gần đây nhất từ máy chủ và trỏ nhánh master cục bộ vào nó như sau<br />
+ Nếu bạn muốn hủy tất cả thay đổi và commit cục bộ, lấy về (fetch) lịch sử gần đây nhất từ máy chủ và trỏ
+ nhánh master cục bộ vào nó như sau<br />
<code>git fetch origin</code><br />
<code>git reset --hard origin/master</code>
</p>
@@ -220,15 +247,17 @@ <h3>hướng dẫn</h3>
<li><a href="http://help.github.com/">GitHub Help</a></li>
<li><a href="http://marklodato.github.com/visual-git-guide/index-en.html">A Visual Git Guide</a></li>
<li><a href="http://pcottle.github.io/learnGitBranching/">Learn Git Branching</a></li>
- <li><a href="http://zachholman.com/talk/more-git-and-github-secrets/">More Git and GitHub Secrets</a></li>
+ <li><a href="http://zachholman.com/talk/more-git-and-github-secrets/">More Git and GitHub Secrets</a>
+ </li>
<li><a href="http://www.sbf5.com/~cduan/technical/git/">Understanding Git Conceptually</a></li>
</ul>
</p>
<h3>misc</h3>
<p>
- <ul>
- <li><a href="https://github.com/FredrikNoren/ungit">ungit - The easiest way to use git. On any platform. Anywhere.</a></li>
- </ul>
+ <ul>
+ <li><a href="https://github.com/FredrikNoren/ungit">ungit - The easiest way to use git. On any platform.
+ Anywhere.</a></li>
+ </ul>
</p>
</div>
<a name="comments"></a>
@@ -240,15 +269,22 @@ <h2>bình luận</h2>
var disqus_shortname = 'git-the-simple-guide'; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */
- (function() {
- var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+ (function () {
+ var dsq = document.createElement('script');
+ dsq.type = 'text/javascript';
+ dsq.async = true;
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
- (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(
+ dsq);
})();
</script>
- <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+ <noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by
+ Disqus.</a></noscript>
</div>
- <a href="http://www.git-tower.com/?source=rd" onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
- <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;" class="cheatsheet"></a>
+ <a href="http://www.git-tower.com/?source=rd"
+ onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
+ <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;"
+ class="cheatsheet"></a>
</body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/index.zh.html b/index.zh.html
index 00f5b3c8..55f7af6e 100644
--- a/index.zh.html
+++ b/index.zh.html
@@ -1,38 +1,55 @@
<!DOCTYPE html>
<html lang="zh-CN">
+
<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title>git - the simple guide - no deep shit!</title>
- <link href='http://fonts.googleapis.com/css?family=Chelsea+Market' rel='stylesheet' type='text/css'>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <title>git - the simple guide - no deep shit!</title>
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/normalize/0/normalize.min.css" type="text/css">
- <link rel="stylesheet" href="css/style.css" type="text/css">
+ <link rel="stylesheet" href="css/style.css" type="text/css">
<script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-652147-13']);
- _gaq.push(['_trackPageview']);
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-652147-13']);
+ _gaq.push(['_trackPageview']);
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
+ (function () {
+ var ga = document.createElement('script');
+ ga.type = 'text/javascript';
+ ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') +
+ '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(ga, s);
+ })();
- function recordOutboundLink(link, category, action) {
- _gat._getTrackerByName()._trackEvent(category, action);
- setTimeout('document.location = "' + link.href + '"', 100);
- }
+ function recordOutboundLink(link, category, action) {
+ _gat._getTrackerByName()._trackEvent(category, action);
+ setTimeout('document.location = "' + link.href + '"', 100);
+ }
</script>
</head>
+
<body>
<div class="scrollblock block-title">
<h1>git - 简明指南</h1>
<p>助你入门 git 的简明指南，木有高深内容 ;)</p>
- <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>
- <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>
+ <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>
+ <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>
<p class="meta">
作者：<a href="http://www.twitter.com/rogerdudler">罗杰·杜德勒</a>
- <br />感谢：<a href="http://www.twitter.com/tfnico">@tfnico</a>, <a href="http://www.twitter.com/fhd">@fhd</a> 和 <a href="http://www.namics.com">Namics</a><br />
+ <br />感谢：<a href="http://www.twitter.com/tfnico">@tfnico</a>, <a href="http://www.twitter.com/fhd">@fhd</a>
+ 和 <a href="http://www.namics.com">Namics</a><br />
其他语言
<a href="index.html">english</a>,
<a href="index.de.html">deutsch</a>,
@@ -45,7 +62,7 @@ <h1>git - 简明指南</h1>
<a href="index.pt_BR.html">português</a>,
<a href="index.ru.html">русский</a>,
<a href="index.tr.html">türkçe</a>,
- <br/>
+ <br />
<a href="index.my.html">မြန်မာ</a>,
<a href="index.ja.html">日本語</a>,
<a href="index.ko.html">한국어</a>
@@ -83,7 +100,7 @@ <h2>创建新仓库</h2>
<h2>检出仓库</h2>
<p>
执行如下命令以创建一个本地仓库的克隆版本：<br />
- <code>git clone /path/to/repository</code> <br />
+ <code>git clone /path/to/repository</code> <br />
如果是远端服务器上的仓库，你的命令会是这个样子：<br />
<code>git clone username@host:/path/to/repository</code>
</p>
@@ -92,7 +109,8 @@ <h2>检出仓库</h2>
<div class="scrollblock block-trees">
<h2>工作流</h2>
<p>
- 你的本地仓库由 git 维护的三棵“树”组成。第一个是你的 <code>工作目录</code>，它持有实际文件；第二个是 <code>暂存区（Index）</code>，它像个缓存区域，临时保存你的改动；最后是 <code>HEAD</code>，它指向你最后一次提交的结果。
+ 你的本地仓库由 git 维护的三棵“树”组成。第一个是你的 <code>工作目录</code>，它持有实际文件；第二个是 <code>暂存区（Index）</code>，它像个缓存区域，临时保存你的改动；最后是
+ <code>HEAD</code>，它指向你最后一次提交的结果。
</p>
<img src="img/trees.png" alt="" />
</div>
@@ -100,7 +118,7 @@ <h2>工作流</h2>
<div class="scrollblock block-add">
<h2>添加和提交</h2>
<p>
- 你可以提出更改（把它们添加到暂存区），使用如下命令：<br />
+ 你可以提出更改（把它们添加到暂存区），使用如下命令：<br />
<code>git add <filename></code><br />
<code>git add *</code><br />
这是 git 基本工作流程的第一步；使用如下命令以实际提交改动：<br />
@@ -126,8 +144,8 @@ <h2>推送改动</h2>
<div class="scrollblock block-branching">
<h2>分支</h2>
<p>
- 分支是用来将特性开发绝缘开来的。在你创建仓库的时候，<i>master</i> 是“默认的”分支。在其他分支上进行开发，完成后再将它们合并到主分支上。
- </p>
+ 分支是用来将特性开发绝缘开来的。在你创建仓库的时候，<i>master</i> 是“默认的”分支。在其他分支上进行开发，完成后再将它们合并到主分支上。
+ </p>
<img src="img/branches.png" alt="" />
<p>
创建一个叫做“feature_x”的分支，并切换过去：<br />
@@ -136,7 +154,7 @@ <h2>分支</h2>
<code>git checkout master</code><br />
再把新建的分支删掉：<br />
<code>git branch -d feature_x</code><br />
- 除非你将分支推送到远端仓库，不然该分支就是 <i>不为他人所见的</i>：<br />
+ 除非你将分支推送到远端仓库，不然该分支就是 <i>不为他人所见的</i>：<br />
<code>git push origin <branch></code>
</p>
</div>
@@ -191,8 +209,8 @@ <h2>替换本地改动</h2>
<p>
假如你操作失误（当然，这最好永远不要发生），你可以使用如下命令替换掉本地改动：<br />
<code>git checkout -- <filename></code><br />
- 此命令会使用 HEAD 中的最新内容替换掉你的工作目录中的文件。已添加到暂存区的改动以及新文件都不会受到影响。
- </p>
+ 此命令会使用 HEAD 中的最新内容替换掉你的工作目录中的文件。已添加到暂存区的改动以及新文件都不会受到影响。
+ </p>
<p>
假如你想丢弃你在本地的所有改动与提交，可以到服务器上获取最新的版本历史，并将你本地主分支指向它：<br />
<code>git fetch origin</code><br />
@@ -203,7 +221,7 @@ <h2>替换本地改动</h2>
<div class="scrollblock block-hints">
<h2>实用小贴士</h2>
<p>
- 内建的图形化 git：<br />
+ 内建的图形化 git：<br />
<code>gitk</code><br />
彩色的 git 输出：<br />
<code>git config color.ui true</code><br />
@@ -246,15 +264,21 @@ <h2>评论</h2>
var disqus_shortname = 'git-the-simple-guide'; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */
- (function() {
- var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+ (function () {
+ var dsq = document.createElement('script');
+ dsq.type = 'text/javascript';
+ dsq.async = true;
dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
- (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(
+ dsq);
})();
</script>
<noscript>启用 JavaScript 才能查看 <a href="http://disqus.com/?ref_noscript">Disqus 提供的评论。</a></noscript>
</div>
- <a href="http://www.git-tower.com/?source=rd" onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
- <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;" class="cheatsheet"></a>
+ <a href="http://www.git-tower.com/?source=rd"
+ onClick="recordOutboundLink(this, 'Outbound Links', 'git-tower.com');return false;" class="tower"></a>
+ <a href="files/git_cheat_sheet.pdf" onClick="recordOutboundLink(this, 'Cheat Sheet', 'git-guide');return false;"
+ class="cheatsheet"></a>
</body>
-</html>
+
+</html>
\ No newline at end of file