mirror of
https://github.com/danielkummer/git-flow-cheatsheet.git
synced 2025-04-25 11:38:23 +02:00
Merge branch 'Jahangir-Sh-gh-pages' into gh-pages
This commit is contained in:
Daniel Kummer
commit
d98c43ab8d
4
.gitignore
vendored
4
.gitignore
vendored
@ -1 +1,3 @@
|
||||
.idea/
|
||||
.idea/
|
||||
# Text editor backup files
|
||||
*~
|
||||
|
||||
40
README.md
40
README.md
@ -6,26 +6,35 @@ A cheatsheet on the usage of git flow, visit http://danielkummer.github.com/git-
|
||||
GIT FLOW
|
||||
========
|
||||
|
||||
Git extensions to provide high-level repository operations for Vincent
|
||||
Driessen's branching model. — Read more:
|
||||
http://nvie.com/posts/a-successful-git-branching-model/
|
||||
Git extensions to provide high-level repository operations for Vincent Driessen's branching model. [Read more](http://nvie.com/posts/a-successful-git-branching-model/)
|
||||
|
||||
|
||||
INIT:
|
||||
|
||||
```
|
||||
$ git flow init
|
||||
```
|
||||
|
||||
TRACK DEVELOP REMOTELY ON GITHUB:
|
||||
#### TRACK DEVELOP REMOTELY ON GITHUB:
|
||||
|
||||
|
||||
```
|
||||
$ git push origin develop
|
||||
```
|
||||
|
||||
**FEATURES:**
|
||||
|
||||
FEATURES:
|
||||
Use to develop new features starting from the develop branch. Merge back into
|
||||
develop branch waiting for a reasonable amount of features to be there before
|
||||
declaring it a release.
|
||||
|
||||
```
|
||||
$ git flow feature
|
||||
$ git flow feature start <name>
|
||||
$ git flow feature finish <name>
|
||||
```
|
||||
|
||||
|
||||
|
||||
```
|
||||
usage: git flow feature [list] [-v]
|
||||
git flow feature start [-F] <name> [<base>]
|
||||
git flow feature finish [-rFk] <name|nameprefix>
|
||||
@ -35,33 +44,42 @@ usage: git flow feature [list] [-v]
|
||||
git flow feature rebase [-i] [<name|nameprefix>]
|
||||
git flow feature checkout [<name|nameprefix>]
|
||||
git flow feature pull <remote> [<name>]
|
||||
```
|
||||
|
||||
**RELEASES:**
|
||||
|
||||
RELEASES:
|
||||
Use to group together latest development (features) add a few finishing touches
|
||||
if necessary and send to production. All last changes will merge back to master
|
||||
and develop so new features will start from current release.
|
||||
|
||||
```
|
||||
$ git flow release
|
||||
$ git flow release start <release> [<base>]
|
||||
$ git flow release finish <release>
|
||||
|
||||
```
|
||||
```
|
||||
usage: git flow release [list] [-v]
|
||||
git flow release start [-F] <version>
|
||||
git flow release finish [-Fsumpk] <version>
|
||||
git flow release publish <name>
|
||||
git flow release track <name>
|
||||
```
|
||||
|
||||
**HOTFIXES:**
|
||||
|
||||
HOTFIXES:
|
||||
Similar to releases but the hotfix branch starts off master to avoid unvoluntary
|
||||
send to production of unwanted features that my be present in branches. The
|
||||
quick fix must be used when an important bug arises in production which must be
|
||||
fixed and can't wait for other features to be ready. It merges back to master
|
||||
and develop.
|
||||
|
||||
```
|
||||
$ git flow hotfix
|
||||
$ git flow hotfix start <release> [<base>]
|
||||
$ git flow hotfix finish <release>
|
||||
|
||||
```
|
||||
```
|
||||
usage: git flow hotfix [list] [-v]
|
||||
git flow hotfix start [-F] <version> [<base>]
|
||||
git flow hotfix finish [-Fsumpk] <version>
|
||||
```
|
||||
|
||||
3
css/style.ca_CA.css
Normal file
3
css/style.ca_CA.css
Normal file
@ -0,0 +1,3 @@
|
||||
.lines-big {
|
||||
height: 5030px;
|
||||
}
|
||||
@ -14,7 +14,7 @@ header {
|
||||
box-shadow: 0px 5px 7px #8db7bd;
|
||||
-webkit-box-shadow: 0px 5px 7px #8db7bd;
|
||||
-moz-box-shadow: 0px 5px 7px #8db7bd;
|
||||
height: 400px;
|
||||
/*height: 400px;*/
|
||||
background-color: #8db7bd;
|
||||
border-bottom: 1px solid #698b91
|
||||
}
|
||||
@ -59,10 +59,28 @@ h3 {
|
||||
|
||||
p {
|
||||
margin: 20px auto;
|
||||
text-shadow: 0 2px 1px #fff;
|
||||
text-shadow: none;
|
||||
color: #222438;
|
||||
}
|
||||
|
||||
h2 a {
|
||||
text-decoration: none;
|
||||
font-size: 60px;
|
||||
font-weight: normal;
|
||||
margin: 0;
|
||||
margin-bottom: 25px;
|
||||
text-shadow: 0 2px 1px #000;
|
||||
color: #FFB000;
|
||||
font-family: 'Sansita One', cursive;
|
||||
}
|
||||
|
||||
h2 a:hover {
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
h2 a:visited {
|
||||
color: #FFB000;
|
||||
}
|
||||
|
||||
a, a:visited {
|
||||
color: #D92B00;
|
||||
@ -75,7 +93,7 @@ ul {
|
||||
margin-left: 0;
|
||||
padding-left: 1em;
|
||||
text-indent: -1em;
|
||||
text-shadow: 0 2px 1px #fff;
|
||||
text-shadow: none;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
@ -92,11 +110,13 @@ blockquote {
|
||||
border-right: 2px solid #30334F;
|
||||
border-radius: 10px;
|
||||
padding: 5px 20px;
|
||||
color:white;
|
||||
color: white;
|
||||
font-family: menlo, monospace;
|
||||
word-wrap: break-word;
|
||||
}
|
||||
|
||||
code {
|
||||
display: inline-block;
|
||||
font-style: normal;
|
||||
padding-left: 5px;
|
||||
border-radius: 10px;
|
||||
@ -140,7 +160,7 @@ code {
|
||||
|
||||
.lines-big {
|
||||
width: 300px;
|
||||
height: 4140px;
|
||||
height: 4395px;
|
||||
background-repeat: repeat-y;
|
||||
background: url("../img/lines-big.png");
|
||||
position: absolute;
|
||||
@ -161,7 +181,7 @@ code {
|
||||
height: 52px;
|
||||
background: url("../img/lines-close.png");
|
||||
position: relative;
|
||||
left: 11px;
|
||||
left: 11px;
|
||||
}
|
||||
|
||||
.hotfix-end, .hotfix-start, .release-end, .release-start, .feature-end, .feature-start {
|
||||
@ -286,12 +306,10 @@ code {
|
||||
}
|
||||
|
||||
#author {
|
||||
width: 640px;
|
||||
position: absolute;
|
||||
width: 80%;
|
||||
top: 230px;
|
||||
right: 15%;
|
||||
font-size: 20px;
|
||||
text-align: right;
|
||||
text-align: center;
|
||||
font-style: italic;
|
||||
color: #D92B00;
|
||||
z-index: 100;
|
||||
@ -304,17 +322,16 @@ code {
|
||||
}
|
||||
|
||||
#desc {
|
||||
position: absolute;
|
||||
top: 300px;
|
||||
width: 100%;
|
||||
width: 90%;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#translations {
|
||||
position: absolute;
|
||||
top: 340px;
|
||||
width: 100%;
|
||||
right: 15%;
|
||||
text-align: right;
|
||||
width: 80%;
|
||||
right: 5%;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#translations .active {
|
||||
|
||||
7
css/style.zh_TW.css
Normal file
7
css/style.zh_TW.css
Normal file
@ -0,0 +1,7 @@
|
||||
h1, h2, h3 {
|
||||
font-family: 'Sansita One', 'Heiti TC', 'Microsoft YaHei', cursive
|
||||
}
|
||||
|
||||
h1 a, h2 a, h3 a {
|
||||
font-family: 'Sansita One', 'Heiti TC', 'Microsoft YaHei', cursive
|
||||
}
|
||||
409
index.az_AZ.html
Normal file
409
index.az_AZ.html
Normal file
@ -0,0 +1,409 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>git-flow soraqçası</title>
|
||||
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_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);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">git-flow soraqçası</h1>
|
||||
|
||||
<p id="author">
|
||||
<a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> tərəfindən yaradılıb
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">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>
|
||||
<p id="desc"><a href="http://nvie.com/">Vincent Driessen</a> tərəfindən git-flow vasitəsilə effektiv budaqlanma</p>
|
||||
<p id="translations">translations:
|
||||
<a href="#" class="active" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Haqqında</h2>
|
||||
|
||||
<p>
|
||||
Git-flow depo üzərində Vincent Driessen'in budaqlanma modeli üzrə yüksək səviyyəli əməliyyatlar aparmaq üçün git əlavələrinin yığınıdır.
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">ətraflı</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>Bu soraqça git-flow əməliyyatlarının istifadəsinin əsaslarını və effektini göstərir</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Əsas ipucuları</h2>
|
||||
<ul>
|
||||
<li>Git-flow möhtəşəm kömək və çıxış imkanı verir. Nə baş verdiyini görmək üçün onu diqqətlə oxuyun ... </li>
|
||||
<li>OSX/Windows kliyenti <a href="http://www.sourcetreeapp.com/">Sourcetree</a> git üçün mükəmməl qrafik istifadəçi interfeysidir, həmçinin git-flow dəstəyi təqdim edir.</li>
|
||||
<li>Git-flow birləşmə əsaslı həlldir. O xüsusiyyət budaqlarını birləşdirmək üçün rebase istifadə etmir.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Quraşdırılması</a></h2>
|
||||
<ul>
|
||||
<li>Öncədən git'in quraşdırılması, işlək olması şərtdir.</li>
|
||||
<li>Git flow OSX, Linux və Windows-da çalışır</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>OSX</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<span>Debian əsaslı distributivlər</span>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<span>Red Hat əsaslı distributivlər</span>
|
||||
<blockquote>
|
||||
$ yum install gitflow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>Git-flow quraşdırmaq üçün wget və util-linux alətləri lazımdır.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Git-flow'nun detallı quraşdırılma addımları üçün zəhmət olmasa <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow
|
||||
wiki</a> səhifəsinə daxil olun.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Başlayarkən</a></h2>
|
||||
<p>Layihənizin ilkin tənzimlənməsi üçün git-flow'nun başladılması lazımdır.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Başladılma</h3>
|
||||
|
||||
<p>Git-flow'nu mövcud git deponun daxilində başlatmaqla istifadə edin:</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
Budaqlarınızın adlandırma konvensiyasıyla bağlı bir neçə suala cavab verməli olacaqsınız.<br/>
|
||||
Öncədən təyin edilmiş qiymətlər istifadə etmək tövsiyyə olunur.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Xüsusiyyətlər</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Gələcək buraxılışlar üçün yeni xüsusiyyətlər tərtib edin.</li>
|
||||
<li>Adətən yalnız tərtibatçıların deposunda olur.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Yeni xüsusiyyət başladın</h3>
|
||||
<p>Yeni xüsusiyyətlərin tərtibatı 'develop' budağından başlayır.</p>
|
||||
<p>Yeni xüsusiyyətin tərtibatına</p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>ilə başlayın</p>
|
||||
<p>Bu əmr 'develop' əsasında yeni xüsusiyyət budağı yaradır və ona qoşulur</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Xüsusiyyəti tamamlayın</h3>
|
||||
|
||||
<p>
|
||||
Xüsusiyyətin tərtibatını tamamlayın.
|
||||
Bu əmr aşağıdakılarını yerinə yetirir:
|
||||
</p>
|
||||
<ul>
|
||||
<li>MYFEATURE budağını 'develop' budağına birləşdirir</li>
|
||||
<li>Xüsusiyyət budağını silir</li>
|
||||
<li>'develop' budağına qoşulur</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Xüsusiyyəti yayımlayın</h3>
|
||||
|
||||
<p>
|
||||
Xüsusiyyəti birlikdə tərtib edirsiniz? <br/>
|
||||
Tərtib etdiyiniz xüsusiyyəti kənar serverə yayımlayın ki, digər istifadəçilər ondan yararlana bilsinlər.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Yayımlanmış xüsusiyyətin əldə olunması</h3>
|
||||
|
||||
<p>
|
||||
Digər istifadəçinin yayımladığı xüsusiyyəti əldə edin.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull origin MYFEATURE
|
||||
</blockquote>
|
||||
|
||||
<p>Xüsusiyyəti origin deposunda aşağıdakı əmrlə izləyə bilərsiniz <code> git flow feature track MYFEATURE</code></p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Buraxılış yaradın</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Yeni buraxılışa hazırlıqda kömək edir.</li>
|
||||
<li>Kiçik xətaların düzəldilməsinə və buraxılış üçün meta-məlumatların hazırlanmasına imkan verir</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Buraxılışa başlayın</h3>
|
||||
|
||||
<p>Buraxılışa başlamaq üçün git flow release əmrindən istifadə edin. O 'develop' budağı əsasında buraxılış budağını yaradır.</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p>İstədiyiniz halda <code>[BASE]</code> - kommitin sha-1 heşini verməklə buraxılışa burdan başlaya bilərsiniz.
|
||||
Bu kommit 'develop' budağında olmalıdır.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>Digər tərtibatçıların da buraxılış kommitlərinə imkan yaratmaq üçün, buraxılış budağı yaradıldıqdan dərhal sonra yayımlanması yaxşı olardı. Bunu aşağıdakı əmrlə, xüsusiyyət yayımlanmasına bənzər şəkildə edin:</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>(Kənar buraxılışları izləmək üçün <br/><code>git flow release track RELEASE</code> əmrindən istifadə edə bilərsiniz)</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Buraxılışı tamamlayın</h3>
|
||||
|
||||
<p>Buraxılışın tamamlanması git budaqlanmsında böyük addımlardan biridir. O aşağıdakıları yerinə yetirir:</p>
|
||||
<ul>
|
||||
<li>Buraxılış budağını 'master' budağına birləşdirir</li>
|
||||
<li>Buraxılışı adına uyğun teqləyir</li>
|
||||
<li>Buraxılış budağı geriyə, 'develop' budağına birləşir</li>
|
||||
<li>Buraxılış budağı silinir</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
<p><code>git push --tags</code> əmri ilə teqlərinizi göndərməyi unutmayın</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Düzəlişlər</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Düzəliş ehtiyacı məhsulun işlək, hazır versiyasındakı arzuolunmaz halı dərhal aradan qaldırmaq üçün yaranır.</li>
|
||||
<li>Hazır versiyaya uyğun master budağındakı teqdən budaqlana bilər.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Digət git flow əmrləri kimi düzəliş</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p>ilə başlayır</p>
|
||||
<p>Versiya arqumenti yeni düzəliş edilmiş buraxılış adını təyin edir. İstədiyiniz halda düzəlişə başlayacağınız BASENAME-kommiti göstərə bilərsiniz.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Düzəlişi tamamlayın</h3>
|
||||
<p>Düzəliş tamamlandığı halda o 'develop' və 'master' budaqlarına birləşir. Əlavə olaraq 'master' budağına birləşmə düzəlişin versiyası ilə teqlənir.</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Əmrlər</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Qeyd və qalıqlar</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Bura bütün mövcud əmrlər deyil, ən vacibləri qeyd edilmişdir</li>
|
||||
<li>Siz hələ də git və onun əmrlərini bildiyniz, normal qaydada istifadə edə bilərsiniz, git flow sadəcə alətlər toplusudur</li>
|
||||
<li>'support' imkanı hələ beta versiyasındadır, istifadəsi tövsiyə olunmur</li>
|
||||
<li>Əgər siz tərcümələr təqdim etmək istəsəniz, onları qoşmaqda məmnun olaram</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Şərhlər</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // 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 = 'http://' + 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>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
405
index.ca_CA.html
Normal file
405
index.ca_CA.html
Normal file
@ -0,0 +1,405 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="ca" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.ca_CA.css" type="text/css" media="screen,print">
|
||||
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_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);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">git-flow cheatsheet</h1>
|
||||
|
||||
<p id="author">
|
||||
creat per <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">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>
|
||||
<p id="desc">branques eficients usant git-flow, per <a href="http://nvie.com/">Vincent Driessen</a></p>
|
||||
<p id="translations">traduccions:
|
||||
<a href="index.html" class="active" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="#" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Sobre git-flow</h2>
|
||||
|
||||
<p>
|
||||
git-flow és un conjunt d'extensions de git que proporcionen operacions d'alt nivell sobre repositoris pel model de branques de Vincent Driessen.
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">més</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>Aquest full de referència ràpida mostra l'ús bàsic i l'efecte de les operacions de git-flow</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Consells bàsics</h2>
|
||||
<ul>
|
||||
<li>Git flow proporciona ajuda i sortides excel·lents per la línia de comandes. Llegeix-la amb atenció per veure què està passant...</li>
|
||||
<li>El client per OSX/Windows <a href="http://www.sourcetreeapp.com/">Sourcetree</a> és una excel·lent interfície gràfica per git i té suport per git-flow
|
||||
</li>
|
||||
<li>Git-flow és una solució basada en merge. No fa rebase de branques de funcionalitat (feature branches).</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Instal·lació</a></h2>
|
||||
<ul>
|
||||
<li>Necessites una instal·lació de git funcionant com a prerrequisit.</li>
|
||||
<li>Git flow funciona a OSX, Linux i Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>OSX</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>Necessites wget i util-linux per instal·lar git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Per instruccions detallades per instal·lar git flow, visita la <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">wiki de git flow</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Començant</a></h2>
|
||||
<p>Git flow necessita inicialitzar-se per personalitzar la configuració del teu projecte.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Inicialitzar</h3>
|
||||
|
||||
<p>Comença a usar git-flow inicialitzant-lo en un repositori git existent:</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
Hauràs de contestar unes preguntes respecte les convencions per anomenar les branques.<br/>
|
||||
Es recomana usar els valors per defecte.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Funcionalitats (features)</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Desenvolupa noves funcionalitats per les properes entregues (releases)</li>
|
||||
<li>Normalment només existeixen en els repositoris dels desenvolupadors</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Comença una nova funcionalitat</h3>
|
||||
<p>El desenvolupament de noves funcionalitats comença des de la branca 'develop'.</p>
|
||||
<p>Comença a desenvolupar una nova funcionalitat amb</p>
|
||||
<blockquote>
|
||||
git flow feature start LAMEVAFUNCIONALITAT
|
||||
</blockquote>
|
||||
<p>Aquesta acció crea una nova branca de funcionalitat basada en 'develop' i la fa activa</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Acaba una funcionalitat</h3>
|
||||
|
||||
<p>
|
||||
Acaba el desenvolupament d'una funcionalitat.
|
||||
Aquesta acció realitza el següent:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Integra LAMEVAFUNCIONALITAT a 'develop'</li>
|
||||
<li>Esborra la branca de funcionalitat</li>
|
||||
<li>Torna a fer activa la branca 'develop'</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish LAMEVAFUNCIONALITAT
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Publica una funcionalitat</h3>
|
||||
|
||||
<p>
|
||||
Estàs desenvolupant una funcionalitat en col·laboració amb altres desenvolupadors? <br/>
|
||||
Publica una funcionalitat al servidor remot de manera que hi puguin accedir altres usuaris.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish LAMEVAFUNCIONALITAT
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Obtenint una funcionlitat publicada</h3>
|
||||
|
||||
<p>
|
||||
Obté una funcionalitat publicada per un altre usuari.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull origin LAMEVAFUNCIONALITAT
|
||||
</blockquote>
|
||||
|
||||
<p>Pots seguir una funcionalitat a l'origen usant <code> git flow feature track LAMEVAFUNCIONALITAT</code> </p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Fes una entrega (release)</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Prepara una nova entrega a producció</li>
|
||||
<li>Permet arreglar petits errors i preparar les meta-dades per l'entrega</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Comença una entrega</h3>
|
||||
|
||||
<p>Per començar una entrega, usa la comanda git flow release. Crea una branca d'entrega des de la branca 'develop'.</p>
|
||||
<blockquote>
|
||||
git flow release start ENTREGA [BASE]
|
||||
</blockquote>
|
||||
<p>Pots proporcionar de manera opcional un hash sha-1 d'un commit <code>[BASE]</code> des del qual començar l'entrega. El commit ha d'estar a la branca 'develop'.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>És aconsellable publicar la branca d'entrega després de crear-la per tal que altres desenvolupadors puguin començar a fer-hi commits. Tal com per publicar funcionalitats, amb la comanda:</p>
|
||||
<blockquote>
|
||||
git flow release publish ENTREGA
|
||||
</blockquote>
|
||||
<p>Pots seguir una entrega en remot amb la comanda <br/><code>git flow release track ENTREGA</code></p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Acaba una entrega</h3>
|
||||
|
||||
<p>Acabar una entrega és un dels grans passos en la gestió de branques amb git. Realitza les següents accions:</p>
|
||||
<ul>
|
||||
<li>Integra la branca d'entrega a 'master'</li>
|
||||
<li>Etiqueta l'entrega amb el seu nom</li>
|
||||
<li>Reintegra l'entrega a 'develop'</li>
|
||||
<li>Esborra la branca d'entrega</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish ENTREGA
|
||||
</blockquote>
|
||||
<p>No oblidis pujar les etiquetes amb <code>git push --tags</code></p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Errors a producció (hotfixes)</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>A vegades cal actuar inmediatament davant un estat no desitjat de la versió de producció i fer un hotfix
|
||||
</li>
|
||||
<li>Es pot crear una branca des de l'etiqueta corresponent a la branca 'master' que marqui la versió a producció.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Com les altres comandes de git flow, un hotfix s'inicia amb</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSIÓ [NOMBASE]
|
||||
</blockquote>
|
||||
<p>El paràmetre de la versió marca el nom de la nova entrega. Opcionalment pots especificar un nom base a partir del qual començar.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Acaba un hotfix</h3>
|
||||
|
||||
<p>En acabar un hotfix, els canvis s'integren tant a 'develop' com a 'master'. Addicionalment, la integració a 'master' s'etiqueta amb la versió del hotfix.</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSIÓ
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Comandes</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Tasques pendents</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>No totes les comandes disponibles s'han explicat, només les més importants</li>
|
||||
<li>Pots seguir utilitzant git i totes les seves comandes de la mateixa manera que fins ara, git flow només és un conjunt d'eines
|
||||
</li>
|
||||
<li>La funcionalitat 'support' encara està en fase beta, no s'aconsella usar-la</li>
|
||||
<li>Si vols ajudar en la traducció, <a href="https://github.com/danielkummer/git-flow-cheatsheet">endavant!</a></li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Comentaris</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // 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 = 'http://' + 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>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
441
index.de_DE.html
Normal file
441
index.de_DE.html
Normal file
@ -0,0 +1,441 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_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);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">git-flow Spickzettel</h1>
|
||||
|
||||
<p id="author">
|
||||
erstellt von <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">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>
|
||||
<p id="desc">Effizientes Branching mittels git-flow von <a href="http://nvie.com/">Vincent Driessen</a></p>
|
||||
<p id="translations">Übersetzungen:
|
||||
<a href="index.html" title="English">English</a> -
|
||||
<a href="index.es_ES.html" title="Spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="#" class="active" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Über</h2>
|
||||
|
||||
<p>
|
||||
git-flow ist ein Set aus Git-Erweiterungen, welches komplexe Repository-Arbeiten
|
||||
nach Vincent Driessens Branching-Modell ermöglicht.
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">mehr</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>Dieser Spickzettel veranschaulicht die grundlegende Nutzung und den Ablauf von git-flow Operationen.</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Grundlegende Tipps</h2>
|
||||
<ul>
|
||||
<li>git-flow bietet eine exzellente Hilfe und ausführliche Ausgabe auf der Kommandozeile. Lies dir die Ausgaben aufmerksam durch und versuche zu verstehen, was passiert.</li>
|
||||
<li>Der OSX/Windows Client <a href="http://www.sourcetreeapp.com/">SourceTree</a> bietet ein exzellentes grafisches Interface und einfache Git-Flow Unterstützung.</li>
|
||||
<li>git-flow ist eine rein Merge-basierte Lösung (Zusammenführung). Es findet kein Rebasing der Feature-Branches (Entwicklungszweige) statt.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Einrichtung</a></h2>
|
||||
<ul>
|
||||
<li>Du benötigst eine funktionierende Git Installation als Voraussetzung.</li>
|
||||
<li>git-flow läuft unter OSX, Linux und Windows.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>OSX</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>Du benötigst wget und util-linux um git-flow zu installieren.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Für eine detaillierte git-flow Installationsanleitung, besuche bitte das <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow
|
||||
wiki</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Erste Schritte</a></h2>
|
||||
<p>git-flow muss initalisiert werden, um das Projektsetup anzupassen.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Initialisierung</h3>
|
||||
|
||||
<p>Fange an mit git-flow zu arbeiten, indem Du es innerhalb eines bestehenden Git-Repository initialisierst:</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
Dabei musst Du einige Fragen bezueglich der Namenskoventionen Deiner Branches (Entwicklungszweige) beantworten.<br/>
|
||||
Es wird empfohlen, die Standardwerte zu verwenden.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Features</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Entwicklung neuer Features für bevorstehende Releases.</li>
|
||||
<li>In der Regel nur in Entwickler-Repositories zu finden.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Entwicklung neuer Features</h3>
|
||||
<p>Neue Features werden vom 'develop'-Branch abgeleitet.</p>
|
||||
<p>Starte die Entwicklung eines neuen Features mittels</p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>Dieser Befehl erstellt einen neuen Feature-Branch basierend auf 'develop' und wechselt in diesen.</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Fertigstellung eines Features</h3>
|
||||
|
||||
<p>
|
||||
Beende die Entwicklung eines Features.
|
||||
Dies führt zu folgenden Aktionen:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Zusammenführen von MYFEATURE in den 'develop'-Branch (Merge-Prozess)</li>
|
||||
<li>Entfernt den Feature-Branch</li>
|
||||
<li>Wechselt zurück in den 'develop'-Branch</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Veröffentlichen eines Features</h3>
|
||||
|
||||
<p>
|
||||
Entwickelst Du ein Feature in Zusammenarbeit? <br/>
|
||||
Veröffentliche Dein Feature auf einem entfernten Server,
|
||||
so dass es auch von anderen verfolgt werden kann.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Holen eines veröffentlichten Features</h3>
|
||||
|
||||
<p>
|
||||
Hole ein Feature, welches von einem anderen Nutzer veröffentlicht wurde.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull origin MYFEATURE
|
||||
</blockquote>
|
||||
|
||||
<p>
|
||||
Du kannst ein Feature unter Verwendung von
|
||||
</p>
|
||||
<blockquote>git flow feature track MYFEATURE</blockquote>
|
||||
<p>
|
||||
auf 'origin' verfolgen.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Erstelle ein Release</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Unterstützt die Fertigstellung einer Produktionsversion.</li>
|
||||
<li>Erlaubt geringfügige Bugfixes und die Erstellung der Metadaten für ein Release</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Beginne ein Release</h3>
|
||||
|
||||
<p>
|
||||
Um ein neues Release zu beginnen, benutze den git flow release Befehl.
|
||||
Mit diesem wird ein Release-Branch vom aktuellen 'develop'-Branch erstellt.
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p>
|
||||
Du kannst optional einen <code>[BASE]</code> Commit sha-1 Hash bereitstellen,
|
||||
um ein Release von diesem Commit zu starten. Der Commit muss sich im 'develop'-Branch befinden.
|
||||
</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>
|
||||
Es ist ratsam, den Release-Branch nach der Erstellung zu veröffentlichen und damit anderen Entwicklern
|
||||
die Möglichkeit für Commits zu geben. Mache es ähnlich wie bei einem Feature-Branch mit dem Befehl:
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>
|
||||
(Du kannst ein entferntes Remote-Release mittels <br/>
|
||||
<code>git flow release track RELEASE</code> verfolgen.)
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Fertigstellung eines Releases</h3>
|
||||
|
||||
<p>
|
||||
Das Beenden eines Releases ist einer der größten Schritte im Git-Branching-Prozess.
|
||||
Es bewirkt folgende Aktionen:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Zusammenführen des Release-Branches zurück in den 'master'-Branch. (Merge-Prozess)</li>
|
||||
<li>Markiert (Tagged) das Release mit seinem Namen</li>
|
||||
<li>Zurückführen des Releases in den 'develop'-Branch (Merge-Prozess)</li>
|
||||
<li>Entfernt den Release-Branch</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
<p>Vergesse nicht Deine Tags mittels <code>git push --tags</code> zu pushen.</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
Hotfixes werden notwendig, sobald ein unerwünschter Zustand innerhalb einer Live-Produktionsversion
|
||||
eintritt und resultierend daraus sofort gehandelt werden muss.
|
||||
</li>
|
||||
<li>
|
||||
Ein Hotfix kann aus dem entsprechenden Tag des 'master'-Branches, welcher die Produktionsversion markiert,
|
||||
direkt abgezweigt werden.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Ähnlich wie auch die anderen git-flow Befehle, wird ein Hotfix mittels</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p>
|
||||
begonnen. Das VERSION-Argument markiert hierbei den neuen Hotfix-Release-Namen.
|
||||
Optional kannst Du auch einen BASENAME spezifizieren.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Fertigstellung eines Hotfixes</h3>
|
||||
|
||||
<p>
|
||||
Mit dem Beenden eines Hotfixes wird dieser in den 'develop'- und 'master'-Branch
|
||||
zusammengeführt (Merge). Nebenbei wird der 'master'-Branch mit einem Tag,
|
||||
welcher die Hotfix-Version beinhaltet, markiert.
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Befehle</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Backlog</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Nur die wichtigsten aller verfügbaren Befehle sind hier abgedeckt.</li>
|
||||
<li>Du kannst weiterhin alle Git-Befehle normal nutzen, wie Du es gewohnt bist. Git-flow ist nur eine Werkzeugsammlung.</li>
|
||||
<li>Das 'support' Feature ist noch Beta und die Nutzung nicht empfohlen.</li>
|
||||
<li>Wenn Du Übersetzungen beisteuern möchtest, würde ich mich freuen diese zu integrieren.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Kommentare</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // 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 = 'http://' + disqus_shortname + '.disqus.com/embed.js';
|
||||
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript>Bitte aktiviere Javascript um die Kommentare zu sehen. <a href="http://disqus.com/?ref_noscript">Powered by Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink">Kommentare powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
431
index.el_GR.html
Normal file
431
index.el_GR.html
Normal file
@ -0,0 +1,431 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>git-flow Φύλλο αναφοράς</title>
|
||||
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push ( [ '_setAccount', 'UA-33766650-1' ] );
|
||||
_gaq.push ( [ '_trackPageview' ] );
|
||||
_gaq.push ( [ 'gr._setAccount', 'UA-63807502-1' ] );
|
||||
_gaq.push ( [ 'gr._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 );
|
||||
}) ();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Διακλάδωσέ με στο GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">git-flow Φύλλο αναφοράς</h1>
|
||||
|
||||
<p id="author">
|
||||
δημιουργήθηκε από τον <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">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>
|
||||
<p id="desc">αποτελεσματικές διακλαδώσεις χρησιμοποιώντας το git-flow του <a href="http://nvie.com/">Vincent
|
||||
Driessen</a></p>
|
||||
|
||||
<p id="translations">translations:
|
||||
<a href="#" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" class="active" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Σχετικά</h2>
|
||||
|
||||
<p>
|
||||
Το git-flow είναι ένα σύνολο από επεκτάσεις για το git που παρέχουν υψηλού επιπέδου λειτουργίες σε εν-
|
||||
αποθετήρια για το μοντέλο διακλαδώσεων του Vincent
|
||||
Driessen.
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">περισσότερα</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>Αυτό το φύλλο αναφοράς, παρουσιάζει την βασική χρήση και τα αποτελέσματα των λειτουργιών του git-flow</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Βασικές συμβουλές</h2>
|
||||
<ul>
|
||||
<li>Το Git flow παρέχει εξαιρετική βοήθεια στην γραμμή εντολών και στην έξοδο. Διαβάστε προσεκτικά για να
|
||||
δείτε τι συμβαίνει...
|
||||
</li>
|
||||
<li>Το τερματικό <a href="http://www.sourcetreeapp.com/">Sourcetree</a> για OSX/Windows είναι ένα εξαιρετικό
|
||||
γραφικό περιβάλλων εργασίας για git και παρέχει υποστήριξη για το git-flow
|
||||
</li>
|
||||
<li>Το Git-flow είναι μια λύση βασισμένη στη συγχώνευση (merge). Δεν αναπροσαρμόζει διακλαδώσεις
|
||||
χαρακτηριστικών.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Εγκατάσταση</a></h2>
|
||||
<ul>
|
||||
<li>Είναι προϋπόθεση να έχετε ήδη εγκατεστημένο το git στον υπολογιστή σας.</li>
|
||||
<li>Το Git flow λειτουργεί σε OSX, Linux και Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>OSX</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>Χρειάζεστε το wget και το util-linux για να εγκαταστήσετε το git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Για αναλυτικές οδηγίες εγκατάστασης του git flow παρακαλώ επισκεφτείτε το
|
||||
<a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow wiki</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Αρχίζοντας</a></h2>
|
||||
|
||||
<p>Το Git flow πρέπει να προετοιμαστεί, ώστε να προσαρμόσετε τις ρυθμίσεις του έργου σας.</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Προετοιμασία</h3>
|
||||
|
||||
<p>Αρχίστε να χρησιμοποιείτε το git-flow προετοιμάζοντας το, μέσα σε ένα git εν-αποθετήριο (git repository):</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
Θα πρέπει να απαντήσετε μερικές ερωτήσεις σχετικά με τους κανόνες ονοματοδοσίας για τις διακλαδώσεις.<br/>
|
||||
Συνιστάται η χρήση των τιμών που προτείνονται.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Χαρακτηριστικά</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Δημιουργήστε νέα χαρακτηριστικά για επερχόμενες εκδόσεις</li>
|
||||
<li>Τυπικά υπάρχει μόνο στα εν-αποθετήρια των προγραμματιστών</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Αρχίστε ένα νέο χαρακτηριστικό</h3>
|
||||
|
||||
<p>Η δημιουργία ενός νέου χαρακτηριστικού αρχίζει (δημιουργείται) από την διακλάδωση 'develop'</p>
|
||||
|
||||
<p>Αρχίστε την δημιουργία νέου χαρακτηριστικού με την εντολή</p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>Αυτή η ενέργεια δημιουργεί μια νέα διακλάδωση για νέο χαρακτηριστικό βασισμένη στην διακλάδωση 'develop' και μεταπήδηση στην νέα διακλάδωση</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Ολοκληρώστε την δημιουργία ενός νέου χαρακτηριστικού.</h3>
|
||||
|
||||
<p>
|
||||
Αυτή η ενέργεια κάνει τα ακόλουθα
|
||||
</p>
|
||||
<ul>
|
||||
<li>Συγχωνεύει το MYFEATURE στο 'develop'</li>
|
||||
<li>Αφαιρεί την διακλάδωση που δημιουργήθηκε για το νέο χαρακτηριστικό</li>
|
||||
<li>Μεταπηδά ξανά στην διακλάδωση 'develop'</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Δημοσιεύστε ένα χαρακτηριστικό</h3>
|
||||
|
||||
<p>
|
||||
Αναπτύσσετε ένα χαρακτηριστικό της εφαρμογής σας σε συνεργασία με άλλους προγραμματιστές;<br/>
|
||||
Δημοσιεύστε το χαρακτηριστικό σας στον απομακρυσμένο server, ώστε να μπορούν οι άλλοι προγραμματιστές να το χρησιμοποιήσουν.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Πάρτε ένα δημοσιευμένο χαρακτηριστικό</h3>
|
||||
|
||||
<p>
|
||||
Πάρτε ένα δημοσιευμένο χαρακτηριστικό από τον απομακρυσμένο server που το δημοσίευσε κάποιος άλλος προγραμματιστής.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull origin MYFEATURE
|
||||
</blockquote>
|
||||
|
||||
<p>Μπορείτε να παρακολουθείτε ένα χαρακτηριστικό στον απομακρυσμένο server (origin) χρησιμοποιώντας την εντολή<code> git flow feature track MYFEATURE</code></p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Δημιουργήστε μια νέα έκδοση</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Υποστηρίζει την προετοιμασία μια έκδοσης για παραγωγή</li>
|
||||
<li>Επιτρέπει μικρής σημασίας επιδιορθώσεις σφαλμάτων και προετοιμάζει τα μέτα-δεδομένα για την έκδοση</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Αρχίστε μια έκδοση</h3>
|
||||
|
||||
<p>Για να αρχίσετε μια νέα έκδοση, χρησιμοποιήστε την εντολή του git flow, release. Η εντολή αυτή δημιουργεί μια νέα διακλάδωση, από την διακλάδωση 'develop'</p>
|
||||
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p>Μπορείτε προαιρετικά να εισάγετε ως <code>[BASE]</code> το sha-1 hash ενός commit για να αρχίσετε την νέα έκδοση το συγκεκριμένο commit. Το commit
|
||||
πρέπει να είναι στην διακλάδωση 'develop'.</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>Είναι καλό να δημοσιεύσετε την διακλάδωση έκδοσης, μετά την δημιουργία της, ώστε να επιτρέψετε commits έκδοσης από άλλους προγραμματιστές.
|
||||
Μπορείτε να το κάνετε αυτό, με τον ίδιο τρόπο που δημοσιεύεται τα νέα χαρακτηριστικά, με την εντολή:</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>(Μπορείτε να παρακολουθείτε απομακρυσμένες εκδόσεις με την εντολή <br/><code>git flow release track RELEASE</code>)</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Ολοκληρώνοντας μια νέα έκδοση</h3>
|
||||
|
||||
<p>Η ολοκλήρωση μιας νέας έκδοσης είναι ένα από τα μεγάλα βήματα στις διακλαδώσεις του git γιατί γίνονται πολλές ενέργειες μαζί:</p>
|
||||
<ul>
|
||||
<li>Συγχωνεύει την διακλάδωση της έκδοσης με την διακλάδωση 'master'</li>
|
||||
<li>Βάζει την ετικέτα στην έκδοση με το όνομα της</li>
|
||||
<li>Συγχωνεύει την έκδοση με την διακλάδωση 'develop'</li>
|
||||
<li>Διαγράψει την διακλάδωση της έκδοσης</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
<p>Μην ξεχάσετε να σπρώξετε τις ετικέτες σας με την εντολή <code>git push --tags</code></p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Άμεσες επιδιορθώσεις (Hotfixes)</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>
|
||||
Οι άμεσες επιδιορθώσεις προκύπτουν από την ανάγκη της άμεσης επέμβασης σε μια ανεπιθύμητη κατάσταση της τρέχουσας έκδοσης στο λογισμικό παραγωγής.
|
||||
</li>
|
||||
<li>
|
||||
Μπορεί η νέα διακλάδωση να δημιουργηθεί από την αντίστοιχη ετικέτα στην κεντρική (master) διακλάδωση που χαρακτηρίζει την έκδοση παραγωγής.
|
||||
</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Όπως και οι άλλες εντολές του git flow, μία άμεση επιδιόρθωση αρχίζει με</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p>Η επιλογή VERSION, χαρακτηρίζει το όνομα της νέας άμεσης επιδιόρθωσης. Προαιρετικά μπορείτε να ορίσετε ένα όνομα βάσης για να αρχίσετε από εκεί.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Ολοκληρώνοντας μία άμεση επιδιόρθωση</h3>
|
||||
|
||||
<p>
|
||||
Με την ολοκλήρωση μιας άμεσης επιδιόρθωσης, η διακλάδωση συγχωνεύεται με την διακλάδωση develop και master.
|
||||
Επιπλέον η κεντρική διακλάδωση (master) αποκτά την ετικέτα του ονόματος της άμεσης επιδιόρθωσης.
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Εντολές</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Σημειώσεις</h2>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Εδώ δεν καλύπτονται όλες οι διαθέσιμες εντολές, αλλά μόνο οι πιο σημαντικές</li>
|
||||
<li>Μπορείτε να συνεχίσετε την χρήση του git και όλες τις εντολές του κανονικά όπως τις γνωρίζετε, το git flow είναι απλά μια συλλογή με εργαλεία.</li>
|
||||
<li>Το χαρακτηριστικό 'support' είναι ακόμα σε κατάσταση beta, δεν σας συμβουλεύουμε να το χρησιμοποιήσετε</li>
|
||||
<li>Αν σας αρέσει να παρέχετε μεταφράσεις, θα είναι χαρά μου να τις ενσωματώσω</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Σχόλια</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // 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 = 'http://' + disqus_shortname + '.disqus.com/embed.js';
|
||||
(document.getElementsByTagName ( 'head' )[ 0 ] || document.getElementsByTagName ( 'body' )[ 0 ]).appendChild ( dsq );
|
||||
}) ();
|
||||
</script>
|
||||
<noscript>Παρακαλώ ενεργοποιείστε την JavaScript για να δείτε τα <a href="http://disqus.com/?ref_noscript">σχόλια που υποστηρίζονται από το Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink">τα σχόλια παρέχονται από το <span class="logo-disqus">Disqus</span></a>
|
||||
</body>
|
||||
</html>
|
||||
404
index.es_ES.html
Normal file
404
index.es_ES.html
Normal file
@ -0,0 +1,404 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_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);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">git-flow cheatsheet</h1>
|
||||
|
||||
<p id="author">
|
||||
creado por <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">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>
|
||||
<p id="desc">ramificaciones eficientes usando git-flow, por <a href="http://nvie.com/">Vincent Driessen</a></p>
|
||||
<p id="translations">traducciones:
|
||||
<a href="index.html" title="english">English</a> -
|
||||
<a href="#" class="active" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Acerca de git-flow</h2>
|
||||
|
||||
<p>
|
||||
git-flow es un conjunto de extensiones para git que proveen comandos de alto nivel para operar repositorios
|
||||
basados en el modelo de ramificaciones de Vincent
|
||||
Driessen.
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">más</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>Esta hoja de referencia explica las operaciones básicas de git-flow, los comandos y sus efectos.</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Consejos básicos</h2>
|
||||
<ul>
|
||||
<li>Git flow provee una excelente ayuda en la línea de comandos y e información. Lée con atención lo que sucede...</li>
|
||||
<li>El cliente para OSX <a href="http://www.sourcetreeapp.com/">Sourcetree</a> es una excelente GUI para git y tiene soporte para git-flow
|
||||
</li>
|
||||
<li>- Git-flow funciona basándose en fusiones de ramas (merge). No reorganiza (branch rebase) las ramas de características (feature branches).</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Configuración</a></h2>
|
||||
<ul>
|
||||
<li>Un prerequisito es una instalación de git en funcionamiento.</li>
|
||||
<li>Git flow funciona en OSX, Linux y Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>OSX</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>Necesitarás wget y util-linux para instalar git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Para instrucciones de instalación detalladas, por favor, visite la <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">wiki de git flow</a>
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Introducción</a></h2>
|
||||
<p>Git flow necesita ser inicializado para poder alterar la configuración del proyecto.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Inicialización</h3>
|
||||
|
||||
<p>Comience a usar git-flow inicializándolo desde dentro de un repositorio git existente:</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
Deberá contestar algunas preguntas relacionadas con las convenciones de nombres para las ramas.<br/>
|
||||
Se recomienda utilizar los valores predeterminados.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Características</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Desarrollar características para futuras versiones</li>
|
||||
<li>Es típico que sólo se use en los repositorios para desarrollo</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Comenzar una nueva característica</h3>
|
||||
<p>El desarrollo de nuevas características parte de la rama 'develop'.</p>
|
||||
<p>Comienze una nueva característica usando</p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>Esta acción crea una nueva rama derivada de 'develop' y salta a esta, estableciéndola como rama de trabajo actual.</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Finalizar una característica</h3>
|
||||
|
||||
<p>
|
||||
Finaliza el desarrollo de una característica.
|
||||
Esta acción realiza lo siguiente:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Fusiona MYFEATURE en 'develop'</li>
|
||||
<li>Borra la rama MYFEATURE</li>
|
||||
<li>Salta a la rama 'develop', estableciéndola como rama de trabajo actual</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Publicar una característica</h3>
|
||||
|
||||
<p>
|
||||
¿Estás trabajando colaborativamente? <br/>
|
||||
Publica una característica a un servidor remoto para que así pueda ser vista por otros.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Obteniendo características publicadas</h3>
|
||||
|
||||
<p>
|
||||
Obtiene una característica publicada por otro y mantiene un seguimiento de sus cambios.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Publicar una versión</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Prepara una versión para producción</li>
|
||||
<li>Permite arreglos menores y la preparación de los metadatos para la publicación</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Comenzar una publicación</h3>
|
||||
|
||||
<p>Para comenzar una publicación, usa el comando git flow release. Creará</p>
|
||||
una rama de publicación derivada de la rama 'develop'.
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p>Opcionalmente, puede usar <code>[BASE]</code> indicando el código sha-1 del cambio desde el cual comenzar la versión de
|
||||
publicación. El cambio debe ser parte de la rama 'develop'.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>Es apropiado publicar remotamente la rama de publicación después de crearla para permitir que otros desarrolladores envíen cambios para esta versión. Hazlo de forma similar a publicar características:</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>(Puede establecer el seguimiento de los cambios de la publicación remota utilizando el comando <br/><code>git flow release track RELEASE</code>)</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Concluir una publicación</h3>
|
||||
|
||||
<p>Dar cierre a una publicación es un gran paso. Realiza varias acciones:</p>
|
||||
<ul>
|
||||
<li>Fusiona la rama de la publicación con la rama 'master'</li>
|
||||
<li>Etiqueta el cambio con su nombre</li>
|
||||
<li>Vuelve a fusionar la publicación con la rama 'develop'</li>
|
||||
<li>Borra la rama de la publicación</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Revisiones</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Las revisiones surgen de la necesidad de actuar inmediatamente cuando la versión ejecutándose en producción se encuentra en un estado que no deseamos
|
||||
</li>
|
||||
<li>Puede ramificarse desde la versión correspondiente etiquetada en la rama 'master' que corresponda a la versión en producción.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Como otros comandos de git flow, una revisión se abre con</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p>El argumento de la versión determina el nombre de la revisión. Opcionalmente, puede agregar un nombre para la base desde la cual comenzar.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Cierra una revisión</h3>
|
||||
|
||||
<p>Al cerrar una revisión, esta se fusiona en las ramas 'develop' y 'master'. Luego, el cambio en 'master' es etiquetado con el nombre de la revisión.</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Comandos</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Tareas pendientes</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Aquí no se han cubierto todos los comandos disponibles, sólo los más importantes</li>
|
||||
<li>Aún puede usar todos los comandos de git normales tal y como los conoces, git-flow sólo es una herramienta más que puedes agregar a tu colección.
|
||||
</li>
|
||||
<li>La característica 'support' aún esta en fase beta y no se recomienda usarla</li>
|
||||
<li>Si quiere proveer traducciones, serán bien recibidas.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Comentarios</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // 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 = 'http://' + 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>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
406
index.fr_FR.html
Normal file
406
index.fr_FR.html
Normal file
@ -0,0 +1,406 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_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);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">git-flow cheatsheet</h1>
|
||||
|
||||
<p id="author">
|
||||
créé par <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">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>
|
||||
<p id="desc">modèle de versionnement efficace utilisant git-flow par <a href="http://nvie.com/">Vincent Driessen</a></p>
|
||||
<p id="translations">traductions:
|
||||
<a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="#" class="active" title="Français">Français</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>A propos</h2>
|
||||
|
||||
<p>
|
||||
git-flow est un ensemble d'extensions git permettant des opérations de haut niveau sur un dépot pour appliquer le modèle de branches de Vincent Driessen.
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">détails</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>Cet aide-mémoire montre l'utilisation et les effets des opérations git-flow</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Conseils de base</h2>
|
||||
<ul>
|
||||
<li>Les commandes et sorties de Git-flow apportent une aide précieuse. Lisez les attentivement pour comprendre ce qui se passe...</li>
|
||||
<li>Le logiciel pour OSX <a href="http://www.sourcetreeapp.com/">Sourcetree</a> est une excellente interface graphique pour git qui supporte git-flow.
|
||||
</li>
|
||||
<li>Git-flow est une solution basée sur les fusions (merge). Elle n'effectue pas de <em>rebase</em> sur les branches de fonctionnalitées</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Installation</a></h2>
|
||||
<ul>
|
||||
<li>Une installation fonctionnelle de git est requise</li>
|
||||
<li>Git flow fonctionne sur OSX, Linux et Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>OSX</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>Vous aurez besoin de wget et de util-linux pour installer git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Pour des instructions détaillées concernant l'installation de git-flow, consultez le
|
||||
<a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">wiki git-flow</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Premiers pas</a></h2>
|
||||
<p>Git flow doit être initialisé afin de personnaliser la configuration de votre projet.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Initialisation</h3>
|
||||
|
||||
<p>Commencez à utiliser git-flow en l'initialisant dans un dépot git existant:</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
Vous devrez répondre à quelques questions concernant les conventions de nommage pour vos branches.<br/>
|
||||
Il est recommandé d'utiliser les valeurs par défaut.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big" style="height:5200px"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Fonctionnalités/Features</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Développe des nouvelles fonctionnalités pour la prochaine version</li>
|
||||
<li>Existe en général uniquement dans les dépots des développeurs</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Commencer une feature</h3>
|
||||
<p>Le développement d'une fonctionnalité commence à partir de la branche 'develop'</p>
|
||||
<p>Commencer le développement d'une nouvelle fonctionnalité avec:</p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>Cette commande crée une nouvelle branche de fonctionnalité basée sur 'develop' et passe sur cette branche</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Terminer une fonctionnalité</h3>
|
||||
<p>
|
||||
Termine le développement d'une fonctionnalité.
|
||||
Cette action effectue les opérations suivantes:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Fusionne MYFEATURE dans 'develop'</li>
|
||||
<li>Supprime la branche de fonctionnalité</li>
|
||||
<li>Passe sur la branche 'develop'</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Publier une fonctionnalité</h3>
|
||||
|
||||
<p>
|
||||
Vous développez une fonctionnalité en collaboration? <br/>
|
||||
Publiez une fonctionnalité sur le serveur distant pour qu'elle puisse être utilisée par d'autres utilisateurs.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Récupérer une fonctionnalité publiée</h3>
|
||||
|
||||
<p>
|
||||
Récupérer une fonctionnalité publiée par un autre utilisateur
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull origin MYFEATURE
|
||||
</blockquote>
|
||||
|
||||
<p>Vous pouvez suivre une fonctionnalité sur le serveur distant en utilisant <code> git flow feature track MYFEATURE</code> </p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Livraison/Release</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Prépare la sortie d'une nouvelle version de production</li>
|
||||
<li>Permet les corrections de bugs mineurs et la préparation des métadonnées de la release</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Commencer une livraison</h3>
|
||||
|
||||
<p>Pour commencer une livraison, utilisez la commande git-flow release</p>
|
||||
créer une branche de livraison basée sur la branche de développement.
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p>Vous pouvez si besoin ajouter le paramètre <code>[BASE]</code>, le hash d'un commit à partir duquel commencera la livraison. Ce commit doit faire partie de la branche de développement.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>Il est préférable de publier la branche de livraison après l'avoir créée pour permettre aux autres développeurs de commiter dessus. De la même manière que pour les fonctionnalités, utilisez cette commande:</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>Vous pouvez suivre une livraison sur le serveur distant en utilisant <br/><code>git flow release track RELEASE</code></p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Terminer une livraison</h3>
|
||||
|
||||
<p>Terminer une livraison est une des étapes majeures de cette méthode. Plusieurs actions sont réalisées:</p>
|
||||
<ul>
|
||||
<li>Fusionne la branche de livraison dans la branche 'master'</li>
|
||||
<li>Etiquette la livraison par son nom</li>
|
||||
<li>Fusionne la livraison dans la branche 'develop'</li>
|
||||
<li>Supprime la branche de livraison</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
<p>N'oubliez pas de pousser vos étiquettes avec <code>git push --tags</code></p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Correctifs/Hotfixes</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Les correctifs sont utiles quand il est nécessaire de corriger immédiatement l'état incorrect de la version en production
|
||||
</li>
|
||||
<li>Ils peuvent se baser sur l'étiquette de la branche 'master' indiquant la version en production.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Commencer un hotfix</h3>
|
||||
|
||||
<p>Comme pour les autres commandes git-flow, un hotfix est commencé par</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p>ici, le paramètre VERSION indique le nom de la future release corrigée. Vous pouvez si besoin spécifier à quelle release s'appliquera le hotfix.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Terminer un hotfix</h3>
|
||||
|
||||
<p>En terminant un hotfix, il est fusionné dans les branches 'develop' et 'master'. De plus la fusion vers 'master' est etiquetée par la version du hotfix.</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Commandes</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>En suspens</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Toutes les commandes disponibles ne sont pas abordées ici, seulement les principales</li>
|
||||
<li>Vous pouvez toujours utiliser normalement git et toutes ses commandes telles que vous les connaissez, git flow est seulement un ensemble d'outils supplémentaires
|
||||
</li>
|
||||
<li>la fonction 'support' est encore en version bêta, il n'est pas conseillé de l'utiliser</li>
|
||||
<li>Si vous voulez ajouter des traductions de ce document, je les intégrerai avec plaisir</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Commentaires</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // 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 = 'http://' + 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>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
409
index.hr_HR.html
Normal file
409
index.hr_HR.html
Normal file
@ -0,0 +1,409 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_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);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">git-flow šalabahter</h1>
|
||||
|
||||
<p id="author">
|
||||
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">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>
|
||||
<p id="desc">efikasno branchanje koristeći git-flow <a href="http://nvie.com/">Vincenta Driessena</a></p>
|
||||
<p id="translations">prijevodi:
|
||||
<a href="#" class="active" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a>
|
||||
<a href="index.hr_HR.html" title="Croatian">Hrvatski</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>O git-flowu</h2>
|
||||
|
||||
<p>
|
||||
git-flow je skup ekstenzija koje omogućuju da se operacije na repozitoriju, koje implementiraju
|
||||
branching model Vincenta Driessena, obavljaju lakše.
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">more</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>Ovaj šalabahter prikazuje osnovnu uporabu i efekte git-flow operacija</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Osnovni savjeti</h2>
|
||||
<ul>
|
||||
<li>Git flow ima izvrsnu pomoć i izlaz na komandnoj liniji. Pažljivo čitajte da vidite što se dešava...</li>
|
||||
<li>OSX/Windows klijent <a href="http://www.sourcetreeapp.com/">Sourcetree</a> je izvrstan GUI alat za git koji nudi
|
||||
podršku i za git-flow.
|
||||
</li>
|
||||
<li>Git-flow je rješenje zasnovano na mergeovima. Ne vrši se rebase brancheva sa novim razvijenim funkcionalnostima.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Postavljanje</a></h2>
|
||||
<ul>
|
||||
<li>Potrebna je funckcionirajuća git instalacaija.</li>
|
||||
<li>Git flow radni na OSX, Linuxu i Windowsima</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>OSX</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>Trebate wget i util-linux za instaliranje git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Za detaljne instalacijske upute posjetite <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow
|
||||
wiki</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Osnove</a></h2>
|
||||
<p>Git flow je potrebno inicijalizirati da prilagodite postavke svog projekta.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Inicijalizacija</h3>
|
||||
|
||||
<p>Započnite sa git-flow inicijalizaciranjem istog u postojećem git repozitoriju:</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
Potrebno je odgovoriti na par pitanja vezano uz konvencije imenovanja brancheva.<br/>
|
||||
Preporuča se uporaba pretpostavljenih vrijednosti.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Funkcionalnosti</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Razvoj novih funkcionalnosti za naredne releasove</li>
|
||||
<li>Tipično se nalaze samo u lokalnom repozitoriju</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Početak nove funkcionalnosti</h3>
|
||||
<p>Nove funkcionalnost započinju se iz 'develop' brancha.</p>
|
||||
<p>Otpočnite razvoj nove funkcionalnosti sa:</p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>Ova akcija kreira branch za novu funkcionalnost baziran na 'develop' i prebacuje u njega</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Dovršavnje funkcionalnosti</h3>
|
||||
|
||||
<p>
|
||||
Dovršite razvoj nove funkcionalnosti.
|
||||
Ova akcija izvršava slijedeće
|
||||
</p>
|
||||
<ul>
|
||||
<li>Mergea MYFEATURE u 'develop'</li>
|
||||
<li>Uklanja branch funkcionalnosti</li>
|
||||
<li>Prebacuje natrag u 'develop' branch</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Publiciranje funkcionalnosti</h3>
|
||||
|
||||
<p>
|
||||
Razvijate li funkcionalnost zajedno s nekim? <br/>
|
||||
Publicirajte funkcionalnost na udaljeni server tako da ju mogu koristiti drugi korisnici.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Preuzimanje publicirane funkcionalnosti</h3>
|
||||
|
||||
<p>
|
||||
Preuzmite funkcionalnost koju je netko razvio.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull origin MYFEATURE
|
||||
</blockquote>
|
||||
|
||||
<p>Možete pratiti razvoj funkcionalnost sa: <code> git flow feature track MYFEATURE</code> </p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Release</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Podrška za publiciranje release-a na produkciju</li>
|
||||
<li>Omogućavanje ispravke manjig bugova i pripremu metapodataka za release</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Započnite release</h3>
|
||||
|
||||
<p>Da započnete release, koristite git flow release komandu. Kreira release branch kreiran iz 'develop' branch-a.</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p>Opcionalno, možete dati <code>[BASE]</code> sha-1 hash commit-a iz kojeg da se započne release. Commit mora biti na 'develop' branchu.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>Bilo bi pametno publicirati release branch nakon kreiranja da se omoguće release commit-i
|
||||
od ostalih developera. Slično publiciranju funkcionlanosti:</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>(Možete pratiti udaljeni release sa <br/><code>git flow release track RELEASE</code> komandom)</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Dovršavanje release-a</h3>
|
||||
|
||||
<p>Dovršiti release je veliki korak u git branchanju. Izvršava nekoliko akcija:</p>
|
||||
<ul>
|
||||
<li>Merge-a release branch natrag u 'master'</li>
|
||||
<li>Tagira release sa njegovim nazivom</li>
|
||||
<li>Merge-a release natrag u 'develop'</li>
|
||||
<li>Uklanja release branch</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
<p>Ne zaboravite da pošaljete tagove sa <code>git push --tags</code></p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Brze prepravke</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Kada je potrebno brzinski ispraviti greške na produkciji, koristi se hotfix mogućnost.
|
||||
</li>
|
||||
<li>Može se napraviti branch iz odgovarajućeg taga na master branchu koji označava produkcijsku verziju.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Kao i druge git flow komande, hotfix se započinje sa</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p>Argumet 'version' označava naziv hotfix release-a. Dodatno, možete specificirati 'basename' iz kojeg se započinje hotfix.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Dovršavanje hotfixa</h3>
|
||||
|
||||
<p>Dovršavanje, hotfix ibiva merge-an natrag u 'develop' i 'master'. Dodatno, merge u 'master' mbiva tagiran sa verzijom hotfixa.</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Komande</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Backlog</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Nisu sve moguće komande, samo one načešće korištene</li>
|
||||
<li>Možete dalje normalno koristiti git i sve njegove komande, git flow je samo kolekcija alata
|
||||
</li>
|
||||
<li>Npr. 'support' mogućnost je još beta, njena se uporaba ne preporuča</li>
|
||||
<li>Pošaljite svoje prijevode, rado ću ih integrirati</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Comments</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // 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 = 'http://' + disqus_shortname + '.disqus.com/embed.js';
|
||||
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript>Molim, omogućite JavaScript da bi vidjeli <a href="http://disqus.com/?ref_noscript">komentare na Disqusu.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink">Komentari putem <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
79
index.html
79
index.html
@ -27,7 +27,7 @@
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="">Fork me on GitHub</a></div>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">git-flow cheatsheet</h1>
|
||||
@ -46,7 +46,28 @@
|
||||
}(document, "script", "twitter-wjs");</script>
|
||||
</p>
|
||||
<p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p>
|
||||
<p id="translations">translations: <a href="#" class="active" title="english">en</a> - <a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a></p>
|
||||
<p id="translations">translations:
|
||||
<a href="#" class="active" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
@ -71,17 +92,17 @@
|
||||
<h2>Basic tips</h2>
|
||||
<ul>
|
||||
<li>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li>
|
||||
<li>The OSX Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides
|
||||
<li>The OSX/Windows Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides
|
||||
git-flow support
|
||||
</li>
|
||||
<li>- Git-flow is a merge based solution. It doesn't rebase feature branches.</li>
|
||||
<li>Git-flow is a merge based solution. It doesn't rebase feature branches.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Setup</h2>
|
||||
<h2><a name="setup" href="#setup">Setup</a></h2>
|
||||
<ul>
|
||||
<li>You need a working git installation as prerequisite.</li>
|
||||
<li>Git flow works on OSX, Linux and Windows</li>
|
||||
@ -89,23 +110,33 @@
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>OSX</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<span>Debian based distributives </span>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<span>Red Hat based distributives</span>
|
||||
<blockquote>
|
||||
$ yum install gitflow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | bash
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>You need wget and util-linux to install git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
For detailed git flow intallation instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow
|
||||
For detailed git flow installation instructions please visit the <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow
|
||||
wiki</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
@ -113,7 +144,7 @@
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Getting started</h2>
|
||||
<h2><a name="getting_started" href="#getting_started">Getting started</a></h2>
|
||||
<p>Git flow needs to be initialized in order to customize your project setup.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
@ -139,7 +170,7 @@
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Features</h2>
|
||||
<h2><a name="features" href="#features">Features</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Develop new features for upcoming releases</li>
|
||||
@ -181,7 +212,7 @@
|
||||
This action performs the following
|
||||
</p>
|
||||
<ul>
|
||||
<li>Merged MYFEATURE into 'develop'</li>
|
||||
<li>Merges MYFEATURE into 'develop'</li>
|
||||
<li>Removes the feature branch</li>
|
||||
<li>Switches back to 'develop' branch</li>
|
||||
</ul>
|
||||
@ -218,12 +249,14 @@
|
||||
<h3>Getting a published feature</h3>
|
||||
|
||||
<p>
|
||||
Get a feature published by another user and track remote changes.
|
||||
Get a feature published by another user.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull MYFEATURE
|
||||
git flow feature pull origin MYFEATURE
|
||||
</blockquote>
|
||||
|
||||
<p>You can track a feature on origin by using <code> git flow feature track MYFEATURE</code> </p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
@ -232,7 +265,7 @@
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Make a release</h2>
|
||||
<h2><a name="release" href="#release">Make a release</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Support preparation of a new production release</li>
|
||||
@ -242,9 +275,7 @@
|
||||
<div class="col-1">
|
||||
<h3>Start a release</h3>
|
||||
|
||||
<p>To start a release, use the git flow release command. It</p>
|
||||
creates a release branch created from the 'develop' branch.
|
||||
</p>
|
||||
<p>To start a release, use the git flow release command. It creates a release branch created from the 'develop' branch.</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
@ -270,13 +301,15 @@
|
||||
<p>Finishing a release is one of the big steps in git branching. It performs several actions:</p>
|
||||
<ul>
|
||||
<li>Merges the release branch back into 'master'</li>
|
||||
<li>Tags the release with it's name</li>
|
||||
<li>Tags the release with its name</li>
|
||||
<li>Back-merges the release into 'develop'</li>
|
||||
<li>Removes the release branch</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
<p>Don't forget to push your tags with<code>git push --tags</code></p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
@ -285,7 +318,7 @@
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Hotfixes</h2>
|
||||
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version
|
||||
@ -311,7 +344,7 @@
|
||||
<div class="col-1">
|
||||
<h3>Finish a hotfix</h3>
|
||||
|
||||
<p>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge ist tagged with the hotfix version.</p>
|
||||
<p>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version.</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
@ -331,7 +364,7 @@
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Commands</h2>
|
||||
<h2><a name="commands" href="#commands">Commands</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
@ -354,7 +387,7 @@
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2>Comments</h2>
|
||||
<h2><a name="comments" href="#comments">Comments</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
@ -379,4 +412,4 @@
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
||||
404
index.it_IT.html
Normal file
404
index.it_IT.html
Normal file
@ -0,0 +1,404 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_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);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork su GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">git-flow cheatsheet</h1>
|
||||
|
||||
<p id="author">
|
||||
creato da <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">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>
|
||||
<p id="desc">branching efficiente usando git-flow realizzato da <a href="http://nvie.com/">Vincent Driessen</a></p>
|
||||
<p id="translations">traduzioni:
|
||||
<a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="#" title="Italiano" class="active">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Introduzione</h2>
|
||||
|
||||
<p>
|
||||
git-flow è un set di estensioni di git che offre dei comandi di alto livello sul repository per utilizzare il modello di branching di Vincent
|
||||
Driessen.
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">maggiori informazioni</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>Questo cheatsheet mostra l'utilizzo di base a gli effetti dei comandi offerti da git-flow</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Consigli di base</h2>
|
||||
<ul>
|
||||
<li>Git flow offre un eccelente guida e un ottimo output da linea di comando. Leggeteli attentamente per vedere cosa sta succedendo...</li>
|
||||
<li>Il Client per OSX/Windows <a href="http://www.sourcetreeapp.com/">Sourcetree</a> è un'eccellente GUI per git e offre supporto per git-flow
|
||||
</li>
|
||||
<li>Git-flow è una soluzione basata sul merge. Non esegue il rebase su i feature branch.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Setup</a></h2>
|
||||
<ul>
|
||||
<li>È necessario un'installazione di git funzionante come prerequisito.</li>
|
||||
<li>Git flow funziona su OSX, Linux e Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>OSX</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>Sono necessari wget e util-linux per installare git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Per le istruzioni dettagliate riguardo l'installazione di git-flow visitate il <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">wiki di git flow</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Per Iniziare</a></h2>
|
||||
<p>Git flow ha la necessità di essere inizializzato per personalizzare il setup del progetto.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Inizializzazione</h3>
|
||||
|
||||
<p>Iniziate ad utilizzare git-flow inizializzandolo all'interno di un repository git esistente:</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
Dovrete rispondere ad alcune domande riguardanti la naming conventions per i tuoi branch.<br/>
|
||||
Si raccomanda l'uso dei valori di default.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Features (Funzionalità)</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Sviluppare nuove features per le releases in arrivo</li>
|
||||
<li>Generalmente sono presenti solo nei repository di sviluppo</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Iniziare una nuova feature</h3>
|
||||
<p>Lo sviluppo di nuove feature cominica dal branch 'develop'.</p>
|
||||
<p>Iniziate lo sviluppo di una nuova feature con</p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>Questa crea un nuovo feature branch basato su 'develop' e si sposta su quello</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Terminare una feature</h3>
|
||||
|
||||
<p>
|
||||
Termina lo sviluppo di una feature.
|
||||
Questa azione esegue le seguenti operazioni
|
||||
</p>
|
||||
<ul>
|
||||
<li>Merge del branch MYFEATURE all'inteno di 'develop'</li>
|
||||
<li>Rimuove il feature branch</li>
|
||||
<li>Si sposta di nuovo sul branch 'develop'</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Pubblicare una feature</h3>
|
||||
|
||||
<p>
|
||||
State sviluppando una feature in collaborazione con altri?<br/>
|
||||
Pubblicate una feature sul server remoto in modo che possa essere utilizzata da altri utenti.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Scaricare una feature pubblicata</h3>
|
||||
|
||||
<p>
|
||||
Scaricare una feature pubblicata da un altro utente.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull origin MYFEATURE
|
||||
</blockquote>
|
||||
|
||||
<p>Potete tracciare una feature sul repository origin usando <code> git flow feature track MYFEATURE</code> </p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Creare una release</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Supporto alla preparazione di una nuova release di produzione</li>
|
||||
<li>Consente di eseguire bug fixes minori e preparare i meta-dati per la release</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Iniziare una release</h3>
|
||||
|
||||
<p>Per iniziare una release usate il comando release di git flow. Crea un release branch a partire dal branch 'develop'.
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p>Potere facoltativmente fornire come parametro <code>[BASE]</code> lo sha-1 hash del commit dal quale far partire la release. Il commit deve essere sul branch 'develop'.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>È una buona idea pubblicare il release branch dopo averlo creato in modo da consentire l'invio di release commit anche da parte di altri sviluppatori. Potete farlo, usando un comando analogo a quello per pubblicare le features, con il comando:</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>(Potete tracciare la release remota con il comando <code>git flow release track RELEASE</code>)</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Terminare una release</h3>
|
||||
|
||||
<p>Terminare una release è uno dei passi più grandi nella gestione dei branch di git. Vengono eseguite svariate operazioni:</p>
|
||||
<ul>
|
||||
<li>Merge del release branch su branch 'master'</li>
|
||||
<li>Tag della relase con il suo nome</li>
|
||||
<li>Merge all'indietro della relase sul branch 'develop'</li>
|
||||
<li>Rimozione del release branch</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
<p>Non dimenticate di fare il push dei tag creati con <code>git push --tags</code></p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Gli Hotfixes nascono dalla necessità di agire immediatamente di fronte ad uno stato indesiderato della versione live di produzione.</li>
|
||||
<li>Possono essere fatti partire dal tag corrispondente sul branch master che contrassegna la versione di produzione.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Come gli altri comandi di git flow, un hotfix comincia con</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p>La versione passata come argomento definisce il nuovo nome dell'hotfix release. Facoltativamente potete specificare un basename da cui partire.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Terminare un hotfix</h3>
|
||||
|
||||
<p>Terminando un hotfix, esso viene integrato (merge) all'indietro all'interno di 'develop' e di 'master'. In aggiunta il master viene taggato con la versone dell'hotfix.</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Comandi</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Backlog</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Non tutti i comandi disponibili sono riportati qui, solo i più importanti</li>
|
||||
<li>Potete comunque usare git e tutti i suoi comandi normalmente come li conoscete, git flow è solo una collezione di strumenti aggiuntivi.
|
||||
</li>
|
||||
<li>La funzionalità 'support' è ancora in beta, 'utilizzo non è consigliato</li>
|
||||
<li>Se volete fornire una traduzione sarò felice di integrarla</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Commenti</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // 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 = 'http://' + 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>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
399
index.ja_JP.html
Normal file
399
index.ja_JP.html
Normal file
@ -0,0 +1,399 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_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);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">git-flow cheatsheet</h1>
|
||||
|
||||
<p id="author">
|
||||
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">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>
|
||||
<p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p>
|
||||
<p id="translations">translations:
|
||||
<a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="#" class="active" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>About</h2>
|
||||
|
||||
<p>
|
||||
git-flowはgitの拡張であり、Vincent Driessenの提唱するブランチモデルを実現するための高度なリポジトリ操作を提供します。
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">more</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>このチートシートは基本的な使い方とgit-flowの効果を表します。</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Basic tips</h2>
|
||||
<ul>
|
||||
<li>Git flow は素晴らしいコマンドライン補助と出力を提供します。何が起こるか注意深く読み解いてください。</li>
|
||||
<li>OSX Clientの <a href="http://www.sourcetreeapp.com/">Sourcetree</a> は素晴らしいGUIとgit-flowサポートを提供します。</li>
|
||||
<li>- Git-flow はマージすることをベースとして考えるソリューションです。リベースは行いません。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Setup</a></h2>
|
||||
<ul>
|
||||
<li>前もってgitをインストールしておく必要があります。</li>
|
||||
<li>Git flow はOSX、Linux、Windowsで動作します。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>OSX</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>git-flowのインストールには、wgetとutil-linuxが必要です。</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
詳細なgit flowのインストール方法は以下のサイトを参考にしてください。 <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow
|
||||
wiki</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Getting started</a></h2>
|
||||
<p>Git flowを開始するには 既存のプロジェクトをカスタマイズします。</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>初期化</h3>
|
||||
|
||||
<p>通常のgitリポジトリ配下に移動した後、下記のコマンドでgit-flow化します。</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
コマンドのあと対話形式で、いくつかの質問に答えます。
|
||||
大体はデフォルトの値が推奨されます。
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Features</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>通常の開発を行います。</li>
|
||||
<li>基本的には開発者のリポジトリのみに行います。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>開発開始</h3>
|
||||
<p>開発用ブランチは 'develop' ブランチから開始します。開始方法は、</p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>新たな開発用ブランチを'develop'ブランチをベースとして作成し、開発用ブランチにスイッチします。</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>開発終了</h3>
|
||||
|
||||
<p>
|
||||
開発が終了したらコマンドで以下の操作が行われます。
|
||||
</p>
|
||||
<ul>
|
||||
<li>MYFEATUREブランチを'develop'にマージします。</li>
|
||||
<li>開発用ブランチを削除します。</li>
|
||||
<li>そして、'develop'ブランチにスイッチをします。</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>開発分をリモートへ</h3>
|
||||
|
||||
<p>
|
||||
複数人と同じ開発ブランチで作業するときは、
|
||||
自分の変更分をリモートサーバにプッシュします。
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>修正分を取り込む</h3>
|
||||
|
||||
<p>
|
||||
他の人の修正分を自分のローカルにプルします。
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Make a release</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>リリースのための準備を行います。</li>
|
||||
<li>軽微なバグフィックスを行ったり、リリースのため作業を行います。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>リリース準備開始</h3>
|
||||
|
||||
<p>リリース作業を開始するには、git flowのreleaseコマンドを使います</p>
|
||||
'develop'ブランチから'release'ブランチを作成します
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p><code>[BASE]</code>はオプションで 'develop'ブランチの特定のCommitのハッシュ値を指定します。指定がない場合はHEADが使われます。</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>'release'ブランチ作成後に修正をプッシュするには、'feature'の時と似たコマンドを使用します:</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>('release'リポジトリの修正のトラッキングをすることもできます<br/><code>git flow release track RELEASE</code> )</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>リリース準備完了</h3>
|
||||
|
||||
<p>リリース準備の終了作業は、gitのリポジトリが大きく変化します:</p>
|
||||
<ul>
|
||||
<li>'release'ブランチを'master'にマージします。</li>
|
||||
<li>'master'ブランチにリリース用のタグをつけます。</li>
|
||||
<li>'develop'ブランチに'release'ブランチの内容がマージされます。</li>
|
||||
<li>'release'ブランチが削除されます。</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>すぐに適用しなければいけないような、緊急の場合に使用します。</li>
|
||||
<li>'master'ブランチのタグから、緊急対応用のブランチを作成します。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>緊急対応の開始</h3>
|
||||
|
||||
<p>他のgit flowコマンドと似た形で、hotfixを開始します</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p>バージョンの引数は、ホットフィックスリリース名を指定します。 オプションとして開始するベースを指定出来ます。</p>
|
||||
<p></p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>緊急対応の終了</h3>
|
||||
|
||||
<p>緊急対応の終了作業は、'develop'と'master'のブランチをマージします。加えて、'master'ブランチは緊急対応のタグが付けられます。</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Commands</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Backlog</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>コマンドのすべてをカバーしているわけではなく、重要なものだけカバーしています。</li>
|
||||
<li>もちろん、gitのコマンドは通常通りすべて使用することができます。git flowは単にgitのコマンドの集合です。 </li>
|
||||
<li>'support'ブランチの機能はまだベータ版です。それについては言及できません。</li>
|
||||
<li>もし翻訳して頂けるなら、統合してもらえると幸いです。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Comments</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // 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 = 'http://' + 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>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
402
index.ko_KR.html
Normal file
402
index.ko_KR.html
Normal file
@ -0,0 +1,402 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_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);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">git-flow cheatsheet</h1>
|
||||
|
||||
<p id="author">
|
||||
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">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>
|
||||
<p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p>
|
||||
<p id="translations">translations:
|
||||
<a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="#" class="active" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>About</h2>
|
||||
|
||||
<p>
|
||||
git-flow는 Vincent Driessen의 브랜칭 모델을 위한 고수준 저장소 작업을 제공하는 git의 확장입니다.
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">more</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>이 치트 시트는 기본적인 사용법과 git-flow 작업의 효과를 보여줍니다.</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Basic tips</h2>
|
||||
<ul>
|
||||
<li>Git flow는 훌륭한 명령행 도움말과 출력을 제공합니다. 무슨 일이 일어나는지를 알려면 출력을 주의깊게 읽어주세요.</li>
|
||||
<li>OSX/Window Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a>는 훌륭한 git gui를 제공하고 git-flow에 대한 지원을 제공합니다.</li>
|
||||
<li>Git-flow는 병합(merge) 기반의 솔루션입니다. feature 브랜치를 리베이스(rebase)하지 않습니다.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Setup</a></h2>
|
||||
<ul>
|
||||
<li>사전에 제대로 동작하는 git이 설치되어 있어야합니다.</li>
|
||||
<li>Git flow는 OSX, Linux, Windows에서 동작합니다.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>OSX</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>git-flow의 설치를 위해서는 wget과 util-linux가 필요합니다.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
상세한 git flow의 설치 방법은 <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow wiki</a>를 참고하세요.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Getting started</a></h2>
|
||||
<p>Git flow는 프로젝트 설정을 변경하기위해 초기화를 필요로합니다.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>초기화</h3>
|
||||
|
||||
<p>기존 git 저장소 내에서 초기화하는 것으로 git-flow의 사용을 시작합니다</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
몇몇 질문에 대답해서 브랜치의 명명규칙을 정합니다.
|
||||
기본 값을 사용하기를 권장합니다.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Features</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>다가오는 배포(release)를 위한 새 기능(feature)을 개발합니다.</li>
|
||||
<li>일반적으로 개발자의 저장소에만 존재합니다.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>새 기능(feature) 시작하기</h3>
|
||||
<p>새 기능의 개발은 'develop' 브랜치에서 시작합니다.</p>
|
||||
<p>다음과 같이 새 기능의 개발을 시작합니다.</p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>이것은 'develop'에 기반한 새 기능(feature) 브랜치를 생성하고 그 브랜치로 전환합니다.</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>기능 완료</h3>
|
||||
|
||||
<p>
|
||||
기능 개발을 완료합니다.
|
||||
이것은 다음 작업들을 수행합니다.
|
||||
</p>
|
||||
<ul>
|
||||
<li>MYFEATURE 브랜치를 'develop'에 병합(merge)합니다.</li>
|
||||
<li>기능 브랜치를 삭제합니다.</li>
|
||||
<li>'develop' 브랜치로 전환합니다.</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>기능을 게시(publish)</h3>
|
||||
|
||||
<p>
|
||||
기능을 공동으로 개발하고 있나요? <br/>
|
||||
기능을 원격 서버에 게시하여 다른 사용자들도 사용할 수있게 합니다.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>게시된 기능 가져오기</h3>
|
||||
|
||||
<p>
|
||||
다른 사용자가 게시한 기능을 가져옵니다.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull origin MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Make a release</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>새로운 제품 출시 준비를 지원합니다.</li>
|
||||
<li>출시를 위한 사소한 버그 수정이나 메타 데이터 준비를 허용합니다.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>릴리스 시작</h3>
|
||||
|
||||
<p>릴리스를 시작하려면 git flow의 release 명령을 사용합니다.</p>
|
||||
'develop' 브랜치로부터 'release' 브랜치를 생성합니다.
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p>릴리스를 시작할 <code>[BASE]</code> commit sha-1 해시를 선택적으로 줄 수도 있습니다. 그 commit은 반드시 'develop' 브랜치에 있어야합니다.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>릴리스 브랜치를 생성한 후에는 다른 개발자들의 릴리스 commit을 허용하기위해 게시(publish)하는 것이 현명합니다. 기능 게시와 비슷한 방법으로합니다:</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>(원격 'release' 브랜치의 변경 추적은 다음과 같이 합니다<br/><code>git flow release track RELEASE</code> )</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>릴리스 완료</h3>
|
||||
|
||||
<p>릴리스 완료는 git 브랜치하기에서 가장 큰 단계입니다. 몇몇 작업을 수행합니다:</p>
|
||||
<ul>
|
||||
<li>'release' 브랜치를 'master' 브랜치에 병합(merge)</li>
|
||||
<li>릴리스를 릴리스 이름으로 태그(tag)</li>
|
||||
<li>릴리스를 'develop' 브랜치로 재병합(back-merge)</li>
|
||||
<li>'release' 브랜치 삭제</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
<p><code>git push --tags</code>를 사용해 태그들을 push하는 것을 잊지마세요.</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>핫픽스는 현재 출시된 제품에 문제가 생겨서 즉각 대응해야하는 상황에서 필요합니다.</li>
|
||||
<li>'master' 브랜치의 현재 출시된 버전으로 표기(mark)된 태그(tag)로부터 브랜치를 땁니다.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>핫픽스 시작</h3>
|
||||
|
||||
<p>여타 git flow 명령과 비슷한 방법으로 시작합니다.</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p>여기서 버전 인수는 핫픽스 릴리스 이름을 지정합니다. 선택적으로 basename으로 시작점을 지정할 수도 있습니다.</p>
|
||||
<p></p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>핫픽스 완료</h3>
|
||||
|
||||
<p>핫픽스를 종료하면 핫픽스는 'develop' 및 'master' 브랜치로 병합(merge)됩니다. 추가적으로 'master'의 병합분분은 핫픽스 버전으로 태그됩니다.</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Commands</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Backlog</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>여기서는 모든 명령을 다루지 않았습니다. 중요한 것들만 설명했습니다.</li>
|
||||
<li>git 명령도 사용할 수 있습니다. git flow는 단지 도구 모음일 뿐입니다.</li>
|
||||
<li>'support' 기능은 아직 베타 버전입니다. 사용은 권장되지 않습니다.</li>
|
||||
<li>번역해주신다면 저는 행복하게 통합할 것입니다.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Comments</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // 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 = 'http://' + 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>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
408
index.nl_NL.html
Normal file
408
index.nl_NL.html
Normal file
@ -0,0 +1,408 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_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);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">git-flow cheatsheet</h1>
|
||||
|
||||
<p id="author">
|
||||
gemaakt door <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">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>
|
||||
<p id="desc">efficient branchen met behulp van git-flow door <a href="http://nvie.com/">Vincent Driessen</a></p>
|
||||
<p id="translations">vertalingen:
|
||||
<a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="#" class="active" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Over</h2>
|
||||
|
||||
<p>
|
||||
git-flow is een set van git extensies voor high-level repository operaties voor Vincent
|
||||
Driessen's branching model.
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">meer</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>Dit cheatsheet laat het basisgebruik en de effecten zien van git-flow operaties</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Basistips</h2>
|
||||
<ul>
|
||||
<li>Git flow biedt uitstekende commandline hulp en output. Lees het zorgvuldig om te zien wat er gebeurt...</li>
|
||||
<li>Het OSX/Windows programma <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is een uitstekende grafische git interface en biedt
|
||||
git-flow ondersteuning
|
||||
</li>
|
||||
<li>Git-flow is een op merge gebaseerde oplossing. Het rebaset feature branches niet.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Installatie</a></h2>
|
||||
<ul>
|
||||
<li>Je hebt een werkende git installatie nodig.</li>
|
||||
<li>Git flow werkt op OSX, Linux en Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>OSX</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>Je hebt wget en util-linux nodig om git-flow te installeren.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Gedetailleerde installatie instructies voor git flow kun je vinden op de<a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow
|
||||
wiki</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Aan de slag</a></h2>
|
||||
<p>Git flow moet geinitializeerd zijn om je project setup aan te passen.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Initializatie</h3>
|
||||
|
||||
<p>Je kan git-flow initializeren door het volgende commando in een bestaande git repository uit te voeren:</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
Je dient een paar vragen te beantwoorden over de naamgevingsconventies voor je branches.<br/>
|
||||
Het is aanbevolen om de standaard waarden te gebruiken.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Features</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Ontwikkel nieuwe features voor aankomende releases</li>
|
||||
<li>Bestaat typisch alleen in de repository van de ontwikkelaar</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Een nieuwe feature starten</h3>
|
||||
<p>Nieuwe features hebben de 'develop' branch als uitgangspunt.</p>
|
||||
<p>Start met ontwikkelen van een nieuwe feature met</p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>Deze actie maakt een nieuwe feature branch gebaseerd op 'develop' en schakelt over naar deze</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Het afronden van een feature</h3>
|
||||
|
||||
<p>
|
||||
Rond de ontwikkeling van een feature af.
|
||||
Deze actie voert de volgende stappen uit
|
||||
</p>
|
||||
<ul>
|
||||
<li>Merge MYFEATURE in 'develop'</li>
|
||||
<li>Verwijdert de feature branch</li>
|
||||
<li>Schakelt terug naar de 'develop' branch</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Een feature publiceren</h3>
|
||||
|
||||
<p>
|
||||
Ontwikkel je de feature samen met anderen? <br/>
|
||||
Publiceer de feature branch dan naar de remote server zodat anderen deze branch ook kunnen gebruiken.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Een gepubliceerde feature ophalen</h3>
|
||||
|
||||
<p>
|
||||
Haal een door een andere ontwikkelaar gepubliceerde feature op.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull origin MYFEATURE
|
||||
</blockquote>
|
||||
|
||||
<p>Je kan de wijzigingen op de feature bijhouden op de server door <code> git flow feature track MYFEATURE</code> uit te voeren</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Een release maken</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Ondersteunt de voorbereiding op een nieuwe productie release</li>
|
||||
<li>Staat kleine bugfixes toe en bereidt meta-data van een release voor</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Een release starten</h3>
|
||||
|
||||
<p>Om een release te starten, kun je het git flow release commando gebruiken. Dit</p>
|
||||
maakt een release branch aan gebaseerd op de 'develop' branch.
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p>Je kan optioneel een <code>[BASE]</code> commit sha-1 hash toevoegen om de release hiervandaan te beginnen. Deze commit moet op de
|
||||
'develop' branch aanwezig zijn.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>Het is verstandig om de release branch te publiceren zodat andere ontwikkelaars hieraan kunnen meewerken. Dit lijkt op het publiceren van een feature branch:</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>(Je kan wijzigingen op de release branch bijhouden met het <br/><code>git flow release track RELEASE</code> commando)</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Een release afronden</h3>
|
||||
|
||||
<p>Een release afronden is een grote stap in git branchen. Het voert verschillende acties uit:</p>
|
||||
<ul>
|
||||
<li>De release branch wordt terug in 'master' gemerged</li>
|
||||
<li>De release wordt getagged met zijn naam</li>
|
||||
<li>De release wordt terug in 'develop' gemerged</li>
|
||||
<li>Verwijdert de release branch</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
<p>Vergeet niet je tags te pushen met <code>git push --tags</code></p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Hotfixes ontstaan wanneer er onmiddellijk gehandeld moet worden na een bug in de live versie
|
||||
</li>
|
||||
<li>Kan de corresponderende tag op de 'master' branch als basis hebben.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Zoals andere git flow commando's, een hotfix wordt gestart door</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p>Het VERSION argument slaat op de nieuwe hotfix release naam. Optioneel kun je de BASENAME aangeven waarvandaan begonnen moet worden.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Een hotfix afronden</h3>
|
||||
|
||||
<p>Het afronden van een hotfix zorgt ervoor dat deze zowel in develop als in master gemerged wordt. Aansluitend wordt de merge in de master getagged met de hotfix versie.</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Commando's</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Backlog</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Niet alle beschikbare commando's zijn hier behandeld, alleen de belangrijkste</li>
|
||||
<li>Je kan git en al zijn commando's gewoon blijven gebruiken daar git flow alleen een handig gereedschap is</li>
|
||||
<li>De 'support' feature is nog steeds in beta, het gebruik hiervan wordt niet geadviseerd</li>
|
||||
<li>Als je vertalingen wilt aanleveren, zal ik deze graag integreren</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Reacties</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // 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 = 'http://' + 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>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
418
index.pl_PL.html
Normal file
418
index.pl_PL.html
Normal file
@ -0,0 +1,418 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="pl" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>ściągawka do git-flow</title>
|
||||
<link href='http://fonts.googleapis.com/css?family=Lobster&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
<style>
|
||||
.title, h1, h2, h2 a, h3 {
|
||||
font-family: 'Lobster';
|
||||
}
|
||||
</style>
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_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);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">ściągawka do git-flow</h1>
|
||||
|
||||
<p id="author">
|
||||
Autor: <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">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>
|
||||
<p id="desc">sprawne rozgałęzianie z git-flow autorstwa <a href="http://nvie.com/">Vincenta Driessen'a</a></p>
|
||||
<p id="translations">tłumaczenia:
|
||||
<a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="#" class="active" title="Polish">Polski</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Wprowadzenie</h2>
|
||||
|
||||
<p>
|
||||
git-flow jest zbiorem rozszerzeń git dostarczającym wysokopoziomowe operacje na repozytorium, wspierającym
|
||||
strategię rozgałęziania opracowaną przez Vincenta Driessen'a.
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">Czytaj więcej</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>Ta ściągawka prezentuje podstawy użycia operacji git-flow.</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Podstawowe wskazówki</h2>
|
||||
<ul>
|
||||
<li>Git flow dostarcza świetną pomoc z poziomu wiersza poleceń. Przeczytaj uważne, aby dostrzec co się wydarzy...
|
||||
</li>
|
||||
<li><a href="http://www.sourcetreeapp.com/">Sourcetree</a> - klient dla OSX/Windows, który jest wyśmienitą
|
||||
nakładką graficzną dla git wspierającą również git-flow.</li>
|
||||
<li>Git-flow bazuje na scalaniu. Nie używa rebase do integrowania zmian.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Konfiguracja</a></h2>
|
||||
<ul>
|
||||
<li>Zanim zaczniesz potrzebujesz działającej instalacji git.</li>
|
||||
<li>Git flow działa na systemach OSX, Linux oraz Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>OSX</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>Potrzebujesz wget oraz util-linux żeby zainstalować git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Szczegółową instrukcję instalacji git możesz znaleźć na
|
||||
<a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow wiki</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Pierwsze kroki</a></h2>
|
||||
<p>Żeby dostosować ustawienia Twojego projektu, Git flow musi zostać zainicjalizowany.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Inicjalizacja</h3>
|
||||
|
||||
<p>Rozpocznij używanie git-flow inicjalizując go w istniejącym repozytorium git:</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
Będziesz musiał odpowiedzieć na kilka pytań dotyczących nazewnictwa gałęzi.<br/>
|
||||
Zaleca się stosowanie wartości domyślnych.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Funkcjonalności</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Rozwój nowych funkcjonalności przyszłych wydań.</li>
|
||||
<li>Zazwyczaj istnieją tylko w repozytoriach deweloperów.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Rozpocznij nową funkcjonalność </h3>
|
||||
<p>Rozwój nowej funkcjonalności rozpoczyna się od gałęzi 'develop'.</p>
|
||||
<p>Rozpocznij rozwój nowej funkcjonalności używając:</p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>W ten sposób tworzysz gałąź dla nowej funkcjonalności bazując na gałęzi 'develop' jednocześnie się na nią
|
||||
przełączając.</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Zakończ funkcjonalność</h3>
|
||||
|
||||
<p>
|
||||
Zakończenie rozwoju funkcjonalności.
|
||||
Ta czynność spowoduje:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Scalenie gałęzi MYFEATURE do 'develop'</li>
|
||||
<li>Usunięcie gałęzi funkcjonalności</li>
|
||||
<li>Przełączenie z powrotem do gałęzi 'develop'</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Opublikowanie funkcjonalności</h3>
|
||||
|
||||
<p>
|
||||
Rozwijasz funkcjonalność w grupie? <br/>
|
||||
Opublikuj funkcjonalność na serwerze zdalnym, dzięki czemu inni też będą jej mogli z niej korzystać.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Pobieranie opublikowanej zmiany</h3>
|
||||
|
||||
<p>
|
||||
Pobierz zmianę opublikowaną przez innego użytkownika.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull origin MYFEATURE
|
||||
</blockquote>
|
||||
|
||||
<p>Możesz śledzić zmianę na serwerze źródłowym używając <code> git flow feature track MYFEATURE</code> </p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Utwórz wydanie</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Wspomaga przygotowanie nowego wydania produkcyjnego</li>
|
||||
<li>Pozwala na drobne poprawki błędów oraz przygotowanie metadanych dla wydania</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Rozpocznij wydanie</h3>
|
||||
|
||||
<p>Aby rozpocząć wydanie użyj polecenia git flow release. Zostanie stworzona gałąź wydania bazująca na gałęzi
|
||||
'develop'.</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p>Opcjonalnie w <code>[BASE]</code> możesz podać skrót sha-1 zmiany od której chcesz rozpocząć wydanie. Zmiana
|
||||
musi pochodzić z gałęzi 'develop'.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>Mądrze jest opublikować gałąź wydania po tym jak się ją stworzy, umożliwiając dodawanie zmian do wydania
|
||||
innym deweloperom. Możesz tego dokonać analogicznie
|
||||
do opublikowania funkcjonalności:</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>(Używając polecenia <br/><code>git flow release track RELEASE</code> możesz śledzić zdalne wydanie)</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Zakończ wydanie</h3>
|
||||
|
||||
<p>Zakończanie wydania jest jednym z dużych kroków w rozgałęzianiu git. Realizuje ono szereg działań:</p>
|
||||
<ul>
|
||||
<li>Scala gałąź wydania do gałęzi 'master'</li>
|
||||
<li>Taguje wydanie jego nazwą</li>
|
||||
<li>Scala z powrotem gałąź wydania do gałęzi 'develop'</li>
|
||||
<li>Usuwa gałąź wydania</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
<p>Nie zapomnij o wypchnięciu tagów poleceniem <code>git push --tags</code></p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Poprawki</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Poprawki wynikają z konieczności podjęcia natychmiastowych działań wobec niepożądanego stanu działającej
|
||||
w wersji produkcyjnej</li>
|
||||
<li>Mogą rozgałęziać się od odpowiedniego tagu wskazującego wersję produkcyjną.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Podobnie jak inne operacje git flow, poprawkę rozpoczyna się od</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p>Parametr VERSION znakuje nazwę nowej poprawki. Opcjonalnie w BASENAME możesz podać nazwę gałęzi od której
|
||||
rozpoczniesz.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Zakończ poprawkę</h3>
|
||||
|
||||
<p>Operacja kończenia poprawki scala poprawkę do gałęzi develop oraz master. Dodatkowo scalenie do gałęzi master
|
||||
jest tagowane wersją poprawki.</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Polecenia</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Końcowe uwagi</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Nie zostały tutaj opisane wszystkie dostępne polecenia, a jedynie te najważniejsze</li>
|
||||
<li>Możesz wciąż normalnie używać git oraz wszystkich jego poleceń tak jak to robiłeś do tej pory - git flow
|
||||
jest tylko zestawem dodatkowych narzędzi</li>
|
||||
<li>Funkcjonalność 'support' jest wciąż w fazie beta - użycie jej nie jest zalecane</li>
|
||||
<li>Jeśli chciałbyś dostarczyć poprawki do tego tłumaczenia, z chęcią je dołączę.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Komentarze</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // 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 = 'http://' + disqus_shortname + '.disqus.com/embed.js';
|
||||
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript>Włącz obsługę JavaScript, aby zobaczyć <a href="http://disqus.com/?ref_noscript">komentarze dostarczane przez Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@ -1,5 +1,5 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<html lang="pt" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
@ -7,24 +7,7 @@
|
||||
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_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);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork no GitHub</a></div>
|
||||
@ -46,14 +29,35 @@
|
||||
}(document, "script", "twitter-wjs");</script>
|
||||
</p>
|
||||
<p id="desc">sistema de branches eficiente usando o git-flow, do <a href="http://nvie.com/">Vincent Driessen</a></p>
|
||||
<p id="translations">traduções: <a href="index.html" title="Inglês">en</a> - <a href="#" class="active" title="Português Brasileiro">pt_BR</a></p>
|
||||
<p id="translations">traduções:
|
||||
<a href="index.html" title="Inglês">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="#" class="active" title="Português Brasileiro">Português Brasileiro</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Sobre</h2>
|
||||
<h2><a name="sobre" href="#sobre" >Sobre</a></h2>
|
||||
|
||||
<p>
|
||||
O git-flow é um conjunto de extensões para o git que provê operações de alto-nível para
|
||||
@ -68,7 +72,7 @@
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Dicas básicas</h2>
|
||||
<h2><a name="dicas_basicas" href="#dicas_basicas" >Dicas básicas</a></h2>
|
||||
<ul>
|
||||
<li>O git-flow oferece na linha de comando ajuda e saídas excelentes. Leia atentamente para ver o que está
|
||||
acontecendo...</li>
|
||||
@ -81,7 +85,7 @@
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Instalação</h2>
|
||||
<h2><a name="instalacao" href="#instalacao" >Instalação</a></h2>
|
||||
<ul>
|
||||
<li>Você precisa do git instalado como pré-requisito.</li>
|
||||
<li>O git flow funciona no OSX, Linux e no Windows</li>
|
||||
@ -89,8 +93,13 @@
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>OSX</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
@ -99,13 +108,13 @@
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | bash
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Para instruções detalhadas sobre a instalação, visite
|
||||
a <a href="https://github.com/nvie/gitflow/wiki/Windows">wiki
|
||||
a <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">wiki
|
||||
do git-flow</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
@ -113,7 +122,7 @@
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Começando</h2>
|
||||
<h2><a name="comecando" href="#comecando" >Começando</a></h2>
|
||||
<p>O git-flow precisa ser inicializado para personalizar a configuração de seu projeto.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
@ -139,7 +148,7 @@
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Funcionalidades/features</h2>
|
||||
<h2><a name="features" href="#features" >Funcionalidades/features</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Desenvolva novas funcionalidades para as versões futuras</li>
|
||||
@ -223,7 +232,7 @@
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Criar uma versão/release</h2>
|
||||
<h2><a name="release" href="#release" >Criar uma versão/release</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Auxilia a preparação de uma nova versão de produção</li>
|
||||
@ -276,7 +285,7 @@
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Hotfixes</h2>
|
||||
<h2><a name="hotfixes" href="#hotfixes" >Hotfixes</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Os hotfixes surgem da necessidade de agir imediatamente sobre uma situação indesejada na versão de produção ativa</li>
|
||||
@ -321,7 +330,7 @@
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Comandos</h2>
|
||||
<h2><a name="comandos" href="#comandos" >Comandos</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
@ -348,8 +357,22 @@
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
<script type="text/javascript">
|
||||
|
||||
/* * * Google Analytics * * */
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_gaq.push(['_trackPageview']);
|
||||
|
||||
<script type="text/javascript">
|
||||
(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);
|
||||
})();
|
||||
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname
|
||||
|
||||
@ -368,4 +391,4 @@
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
||||
404
index.ro_RO.html
Normal file
404
index.ro_RO.html
Normal file
@ -0,0 +1,404 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_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);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">git-flow cheatsheet</h1>
|
||||
|
||||
<p id="author">
|
||||
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">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>
|
||||
<p id="desc">lucrul eficient cu branch-uri folosind git-flow al lui <a href="http://nvie.com/">Vincent Driessen</a></p>
|
||||
<p id="translations">traduceri:
|
||||
<a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="#" class="active" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Despre</h2>
|
||||
|
||||
<p>
|
||||
git-flow sunt un set de extensii git care furnizează operații de nivel înalt pentru întreg repository-ul
|
||||
folosind modelul de branch-uri al lui Vincent Driessen.
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">mai mult</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>Această copiuță arată scenariile de bază, precum și efectul folosirii operațiilor git-flow.</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Pentru început</h2>
|
||||
<ul>
|
||||
<li>Git flow oferă ajutor și output excelente direct în linia de comandă. Citește-le cu atenție pentru a observa ce se întâmplă...</li>
|
||||
<li>Clientul <a href="http://www.sourcetreeapp.com/">Sourcetree</a> pentru OSX/Windows este o interfață excelentă pentru git și are suport pentru git-flow</li>
|
||||
<li>Git-flow este o soluție bazată pe merge-uri. Nu face rebase pe branch-urile de tip feature.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Instalare</a></h2>
|
||||
<ul>
|
||||
<li>Ca și precondiții este nevoie de o instalare git funcțională.</li>
|
||||
<li>Git flow funcționează pe OSX, Linux și Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>OSX</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>Vei avea nevoie de wget și de util-linux pentru a instala git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Pentru instrucțiuni detaliate de instalare a git flow te rugăm să vizitezi <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">wiki-ul git flow</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">La început</a></h2>
|
||||
<p>Git flow trebuie să fie inițializat pentru a putea personaliza proiectul tău.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Inițializare</h3>
|
||||
|
||||
<p>Începe folosirea git-flow prin a-l inițializa în interiorul unui repository git deja existent:</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
Va fi necesar să răspunzi la căteva întrebări legate de convențiile de numire pentru branch-urile tale.<br/>
|
||||
Se recomandă să folosești valorile implicite.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Funcționalități/Features</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Dezvoltă noi funcționalități pentru viitoarele release-uri</li>
|
||||
<li>Există de obicei doar în repository-urile programatorilor</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Începere funcționalitate nouă</h3>
|
||||
<p>Dezvoltarea de funcționalități noi începe din branch-ul 'develop'.</p>
|
||||
<p>Începe dezvoltarea unei funcționalități noi cu</p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>Această acțiune crează un nou branch bazat pe 'develop' și se mută pe el</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Finalizare funcționalitate</h3>
|
||||
|
||||
<p>
|
||||
Încheie dezvoltarea unei funcționalități.
|
||||
Această acțiune execută următoarele operații
|
||||
</p>
|
||||
<ul>
|
||||
<li>Face merge al branch-ului MYFEATURE în 'develop'</li>
|
||||
<li>Șterge branch-ul de tip funcționalitate</li>
|
||||
<li>Se mută înapoi pe branch-ul 'develop'</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Publicare funcționalitate</h3>
|
||||
|
||||
<p>
|
||||
Dezvolți funcționalitate în colaborare cu altcineva? <br/>
|
||||
Publică-ți funcționalitatea pe server, ca ea să poată fi folosită și de alți utilizatori.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Obținerea unei funcționalități publicate</h3>
|
||||
|
||||
<p>
|
||||
Obține funcționalitate publicată de către un alt utilizator.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull origin MYFEATURE
|
||||
</blockquote>
|
||||
|
||||
<p>Poți urmări o funcționalitate la repository-ul origine folosind <code> git flow feature track MYFEATURE</code> </p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Predare/Release</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Ajută la pregătirea unui nou release în producție</li>
|
||||
<li>Permite fixarea unor probleme minore, precum și pregătirea meta-datelor asociate unui release</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Începere release</h3>
|
||||
|
||||
<p>Pentru a începe un release nou, folosește comanda git flow release. Aceasta crează un nou branch de tip release bazat pe branch-ul 'develop'.</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BAZE]
|
||||
</blockquote>
|
||||
<p>Este posibilă furnizarea unei <code>[BAZE]</code> sha-1 de commit pentru a fi folosit drept bază a release-ului ce se crează. Acest commit trebuie să existe pe branch-ul 'develop'.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>Este înțelept a publica branch-ul de release după ce a fost creat, pentru a permite și altor programatori să contribuie. Acest proces este similar celui de publicare funcționalitate; se folosește comanda:</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>(Poți urmări un release cu comanda <br/><code>git flow release track RELEASE</code>)</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Finalizare release</h3>
|
||||
|
||||
<p>Finalizarea unui release este unul din cei mai importanți pași din lucrul cu branch-urile în git. Se efectuează câteva acțiuni:</p>
|
||||
<ul>
|
||||
<li>Merge al branch-ului release înapoi în 'master'</li>
|
||||
<li>Crează tag (etichetă) pentru release, cu numele acestuia</li>
|
||||
<li>Merge al release-ului în branch-ul 'develop'</li>
|
||||
<li>Șterge branch-ul de release</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
<p>Nu uita să publici etichetele cu comanda <code>git push --tags</code></p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Corecturi/Hotfixes</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Corecturile provin din necesitatea de a acționa cât mai curând asupra unei stări nedorite a unei versiuni deja livrate </li>
|
||||
<li>Se poate baza pe eticheta de pe branch-ul master corespunzătoare release-ului țintit.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Începere corectură</h3>
|
||||
|
||||
<p>Asemeni celorlalte comezi git flow, o corectură se începe cu</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p>Argumentul VERSION markează noul nume de release ce va fi atribuit corecturii. În mod opțional poți preciza un nume de bază de la care se va porni în crearea corecturii.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Finalizare corectură</h3>
|
||||
|
||||
<p>Prin finalizarea unei corecturi, aceasta va fi merge-uită înapoi în branch-urile 'develop' și 'master'. Suplimentar, 'master' va fi etichetat cu versiunea corecturii.</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Comenzi</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Rezerve</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Nu toate comenzile disponibile sunt acoperite aici, ci doar cele mai importante</li>
|
||||
<li>Poți folosi în continuare git și toate comenzile sale în mod normal, așa cum le cunoști, deoarece git flow
|
||||
este doar o colecție de instrumente suplimentare
|
||||
</li>
|
||||
<li>Facilitatea de 'support' este încă în beta, de aceea folosirea sa nu este recomandată</li>
|
||||
<li>Dacă dorești să ajuti la traducere, voi fi fericit să le integrez</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Comentarii</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // 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 = 'http://' + disqus_shortname + '.disqus.com/embed.js';
|
||||
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript>Te rugăm să activezi JavaScript pentru a vizualiza <a href="http://disqus.com/?ref_noscript">comentariile oferite cu sprijinul Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comentarii cu sprijinul <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
417
index.ru_RU.html
Normal file
417
index.ru_RU.html
Normal file
@ -0,0 +1,417 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>Шпаргалка по git-flow</title>
|
||||
|
||||
<!-- Lobster is same as Sansita but with cyrillic and another subsets. I recomend to use Lobster instead Sansita everywere-->
|
||||
<link href='http://fonts.googleapis.com/css?family=Lobster&subset=latin,cyrillic' rel='stylesheet' type='text/css'>
|
||||
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
<style>
|
||||
.title, h1, h2, h2 a, h3 {
|
||||
font-family: 'Lobster';
|
||||
}
|
||||
</style>
|
||||
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_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);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">Шпаргалка по git-flow</h1>
|
||||
|
||||
<p id="author">
|
||||
создал <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">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>
|
||||
<p id="desc">эффективное ветвление с помощью git-flow от <a href="http://nvie.com/">Vincent Driessen</a></p>
|
||||
<p id="translations">переводы:
|
||||
<a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="#" class="active" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Введение</h2>
|
||||
|
||||
<p>
|
||||
git-flow — это набор расширений git предоставляющий высокоуровневые операции над репозиторием для поддержки модели ветвления Vincent
|
||||
Driessen.
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">узнать больше</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>Эта шпаргалка показывает основные способы использования операций git-flow.</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Общие замечания</h2>
|
||||
<ul>
|
||||
<li>Git flow предоставляет превосходную командную строку со справкой и улучшенными выводом. Внимательно читайте его, чтобы знать, что происходит...</li>
|
||||
<li>Клиент для OSX/Windows <a href="http://www.sourcetreeapp.com/">Sourcetree</a> — отличный GUI для Git — также поддерживает git-flow
|
||||
</li>
|
||||
<li>Git-flow основан на слиянии. Для слияния веток фич не используется rebase.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Установка</a></h2>
|
||||
<ul>
|
||||
<li>В первую очередь вам нужна рабочая установка git</li>
|
||||
<li>Git flow работает на OSX, Linux и Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>OSX</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>Вам потребуется wget и util-linux для установки git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Подробные инструкции по установке git flow смотрите на <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow
|
||||
wiki</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Приступая к работе</a></h2>
|
||||
<p>Git flow нужно инициализировать, чтобы настроить его для работы с вашим проектом.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Инициализация</h3>
|
||||
|
||||
<p>Для начала использования git-flow проинициализируйте его внутри существующего git-репозитория:</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
Вам придётся ответить на несколько вопросов о способах именования ваших веток.<br/>
|
||||
Рекомендуется оставить значения по умолчанию.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Фичи</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Разработка новых фич для последующих релизов</li>
|
||||
<li>Обычно присутствует только в репозиториях разработчиков</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Начало новой фичи</h3>
|
||||
<p>Разработка новых фич начинается из ветки "develop".</p>
|
||||
<p>Для начала разработки фичи выполните:</p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>Это действие создаёт новую ветку фичи, основанную на ветке "develop", и переключается на неё.</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Завершение фичи</h3>
|
||||
|
||||
<p>
|
||||
Окончание разработки фичи.
|
||||
Это действие выполняется так:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Слияние ветки MYFEATURE в "develop"</li>
|
||||
<li>Удаление ветки фичи</li>
|
||||
<li>Переключение обратно на ветку "develop"</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Публикация фичи</h3>
|
||||
|
||||
<p>
|
||||
Вы разрабатываете фичу совместно с коллегами? <br/>
|
||||
Опубликуйте фичу на удалённом сервере, чтобы её могли использовать другие пользователи.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Получение опубликованной фичи</h3>
|
||||
|
||||
<p>
|
||||
Получение фичи, опубликованной другим пользователем.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull origin MYFEATURE
|
||||
</blockquote>
|
||||
|
||||
<p>Вы можете отслеживать фичу в репозитории origin с помощью команды <code> git flow feature track MYFEATURE</code></p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Создание релиза</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Поддержка подготовки нового релиза продукта</li>
|
||||
<li>Позволяет устранять мелкие баги и подготавливать различные метаданные для релиза</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Начало релиза</h3>
|
||||
|
||||
<p>Для начала работы над релизом используйте команду <code>git flow release</code>
|
||||
Она создаёт ветку релиза, ответляя от ветки "develop".
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p>При желании вы можете указать <code>[BASE]</code>-коммит в виде его хеша sha-1, чтобы начать релиз с него.
|
||||
Этот коммит должен принадлежать ветке "develop".</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>Желательно сразу публиковать ветку релиза после создания, чтобы позволить другим разработчиками выполнять коммиты в ветку релиза.
|
||||
Это делается так же, как и при публикации фичи, с помощью команды:</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>Вы также можете отслеживать удалённый релиз с помощью команды <br/><code>git flow release track RELEASE</code></p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Завершение релиза</h3>
|
||||
|
||||
<p>Завершение релиза — один из самых больших шагов в git-ветвлени. При этом происходит несколько действий:</p>
|
||||
<ul>
|
||||
<li>Ветка релиза сливается в ветку "master"</li>
|
||||
<li>Релиз помечается тегом равным его имени</li>
|
||||
<li>Ветка релиза сливается обратно в ветку "develop"</li>
|
||||
<li>Ветка релиза удаляется</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
<p>Не забудьте отправить изменения в тегах с помощью команды <code>git push --tags</code></p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Исправления</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Исправления нужны в том случае, когда нужно незамедлительно устранить нежелательное состояние продакшн-версии продукта</li>
|
||||
<li>Может ответвляться от соответствующего тега на ветке "master", который отмечает выпуск продакшн-версии</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Как и в случае с другими командами git flow, работа над исправлением начинается так:</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p>Аргумент VERSION определяет имя нового, исправленного релиза.</p>
|
||||
<p>При желании можно указать BASENAME-коммит, от которого произойдёт ответвление.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Завершение исправления</h3>
|
||||
|
||||
<p>Когда исправление готово, оно сливается обратно в ветки "develop" и "master".
|
||||
Кроме того, коммит в ветке "master" помечается тегом с версией исправления.</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Команды</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Последние замечания</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Здесь описаны не все доступные команды, только наиболее важные</li>
|
||||
<li>Вы можете продолжать использовать git и все его команды, как обычно, git flow — это просто набор дополнительных инструментов</li>
|
||||
<li>Возможности "support"-веток пока в beta-версии, использовать их не рекомендуется</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Комментарии</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // 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 = 'http://' + 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>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
454
index.tr_TR.html
Normal file
454
index.tr_TR.html
Normal file
@ -0,0 +1,454 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="tr" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>git-flow cheatsheet</title>
|
||||
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_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);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">git-flow cheatsheet</h1>
|
||||
|
||||
<p id="author">
|
||||
Tasarlayan: <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">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>
|
||||
<p id="desc"><a href="http://nvie.com/">Vincent Driessen</a>'ın verimli dallanma modeli kullanılarak tasarlanmıştır.</p>
|
||||
<p id="translations">çeviriler:
|
||||
<a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="#" class="active" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Hakkında</h2>
|
||||
|
||||
<p>
|
||||
git-flow, Vincent Driessen'in dallanma modeli için geliştirilmiş, git repoları için üst düzey işlemler
|
||||
yapabilmenizi sağlayan, sözkonusu dallanma modelini kullanmayı oldukça kolaylaştıran git eklentilerini içerir.
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/"><br>Vincent Driessen'in dallanma modeli hakkında</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>Bu döküman git flow işlemleri hakkında temel kullanım şekillerini içermektedir.</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Temel Ipuçları</h2>
|
||||
<ul>
|
||||
<li>Git flow komut satırları ile kusursuz yardım (help) ve çıktı (output) sağlar.</li>
|
||||
<li>OSX ve Windows kullanıcıları için <a href="http://www.sourcetreeapp.com/">Sourcetree</a> , git flowa destek
|
||||
veren mükemmel bir git gui aracıdır.
|
||||
|
||||
</li>
|
||||
<li>Git flow birleşme-kaynaşma (merge) tabanlı bir çözümdür. Rebase tabanlı çözümlemelerle karıştırılmamalıdır. Merge tabanlı çözümlerde
|
||||
merge işlemi sonucunda bütün değişiklikler kendi dallanmalarındaki commit ile tek bir dala (branch) bağlanır, başlangıç noktası sabittir.
|
||||
Rebase tabanlı çözümlerde ise kendi dalınız (branch) üzerinde yaptığınız değişiklikler, son yapılan commitler
|
||||
başlangıç noktası alınarak ana dal üzerine eklenir. </li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Ayarlar</a></h2>
|
||||
<ul>
|
||||
<li>Git flow'u kullanabilmek için öncelikli olarak git kurulumunun yapılması gerekmektedir.</li>
|
||||
<li>Git flow OSX, Linux ve Windows üzerinde çalıştırılabilir.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>OSX</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>Git flow kurulumu için wget ve util-linux gerekmektedir.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Git-flow kurulumu hakkında detaylı bilgi için git flow wiki'yi
|
||||
ziyaret edebilirsiniz.<a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow
|
||||
wiki</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Baslarken</a></h2>
|
||||
<p>Git flow, kullanmak istediğiniz projede ayarlarınızı özelleştirmek amacıyla başlatılır (initialize).</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Başlangıç (Initialize)</h3>
|
||||
|
||||
<p>git flow'u kullanmak istediğiniz reponuzdayken;
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>komutuyla başlatabilirsiniz.
|
||||
</p>
|
||||
<p>
|
||||
Bu noktada kafanızda dallarınızı (branches) isimlendirme konusuna ilişkin birçok soru işareti oluşacaktır.
|
||||
Bu bağlamda varsayılan (default) değerleri kullanmanız önerilir.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Özellikler (Features)</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Git flow ile yayınlamak üzere olduğunuz projenize ekleyeceğiniz özellikler için yeni dallarda (feature) kodlama yaparsınız.</li>
|
||||
<li>Genel olarak sadece geliştirici repolarında bulunurlar.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Yeni bir özellik eklemesi başlatmak </h3>
|
||||
<h3>(feature start)</h3>
|
||||
<p>Yeni özelliklerin eklenmesi öncelikle develop dalından (branch) başlar.</p>
|
||||
<p>Yeni bir özelliği kodlamaya </p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>
|
||||
ile başlarız. Bu komut bize develop dalını (branch) temel alan bir özellik dalı (feature) oluşturur.
|
||||
Ve bulunduğumuz dalı feature/MYFEATURE olarak değiştirir.
|
||||
</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Bir özellik eklemesi bitirilirken (feature finish)</h3>
|
||||
|
||||
<p>
|
||||
Bir özelliğin eklenme işlemi bitirilirken şunları yapılır:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Kendi çalıştığımız özellik dalı (burada MYFEATURE) develop ana dalı ile birleştirilir.</li>
|
||||
<li>Bu birleşmeden sonra kendi özellik dalımız (MYFEATURE) silinir.</li>
|
||||
<li>Bulunduğumuz dal tekrar develop olarak değiştirilir.</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
<p>
|
||||
bu işlemleri bizler için yapar.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Bir özelliği yayınlamak</h3>
|
||||
<h3> (Publish a feature)</h3>
|
||||
|
||||
<p>
|
||||
Bir ekip içerisinde geliştirme mi yapıyorsunuz ? <br/>
|
||||
O zaman geliştirdiğiniz özelliği bir uzak sunucuya gönderin,
|
||||
böylelikle geliştirdiğiniz özellik diğer kullanıcılar tarafından kullanılabilir.Öyleyse ;
|
||||
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
<p>
|
||||
sizin için bu işi halledebilir.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Yayınlanmış bir özelliği almak (Getting a published feature)</h3>
|
||||
|
||||
<p>
|
||||
Uzak sunucu üzerinde yayınlanmış bir özelliği kendi yerel (local) çalışma ortamınıza aktarırken:
|
||||
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull MYFEATURE
|
||||
</blockquote>
|
||||
<p>
|
||||
size yardımcı olacaktır.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Bir yayın çıkarırken (release)</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Yeni bir ürünün yayınlanmasına yardımcı olur.</li>
|
||||
<li>Küçük hata giderimleri ve meta-data hazırlığı için kullanılabilir.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Bir sürüm yayınlamak</h3>
|
||||
<h3>(Start a release)</h3>
|
||||
|
||||
|
||||
<p>Yayınlamaya başlamak için,
|
||||
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p>
|
||||
komutu kullanılır.Bu komut ile develop dalını temel kabul eden bir release dalı (branch) yaratılır.
|
||||
</p>
|
||||
<p>Opsiyonel olarak yayınınızın <code>[BASE]</code> noktasından başlamasını sağlayabilirsiniz.
|
||||
Bu commit develop dalında (branch) iken yapılmalıdır.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>Yayınlama dalınız (release branch) oluştuktan sonra bu yöntem ile diğer yazılımcılar tarafından yapılan release
|
||||
commitlerinin de kabul edilmesini sağlayabilirsiniz. Bunu özellik yayınlama (feature publishing) ile kolaylıkla yapabilirsiniz.
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>(Uzak sunucu üzerindeki yayınları <br/>
|
||||
<code>git flow release track RELEASE</code>
|
||||
<br>ile izleyebilirsiniz. )</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Bir sürüm yayınını tamamlamak</h3>
|
||||
<h3>(Finish up a release)</h3>
|
||||
|
||||
<p>
|
||||
Bir sürüm yayınını tamamlarken git dallanmasının (branching) en büyük adımını atarız. Yayınlanma tamamlanırken:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Yayınlama yaptığımız dal olan release dalı (branch) master ana dalı ile birleştirilir.</li>
|
||||
<li>Etiketler (tags) isimleri ile birlikte yayınlanır.</li>
|
||||
<li>Arkaplandaki birleştirmeler (back-merges) develop dalında yayınlanır.</li>
|
||||
<li>Yayınlama için açmış olduğumuz dal (branch) silinir.</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
<p>
|
||||
sizler için bu işlemleri halledecektir. Ancak etiketlerinizi de eklemeyi unutmayın!
|
||||
<code>git push --tags</code> bu sorununuzu da halledecektir.
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Hata giderimleri (Hotfixes)</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Yayına çıkarılmış bir versiyonda istenmeyen durumlar ortaya çıktığında ani hata giderimi için kullanılır.
|
||||
</li>
|
||||
<li>Hotfixler, master ana dalı (branch)ındaki versiyon numarasını belirten etiketten dallanır (branching).</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Bir hata giderimini başlatmak</h3>
|
||||
<h3> (git flow hotfix start)</h3>
|
||||
|
||||
<p>Diğer git flow komutlarında olduğu gibi bir hotfix başlatılırken :</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p>
|
||||
komutu kullanılır.
|
||||
|
||||
Versiyon argümanları yeni hotfix yayınının adını alır. Opsiyonel olarak
|
||||
başlangıç noktası için bir isim özelleştirmesi yapabilirsiniz (basename).</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Hata giderimi bitirme</h3>
|
||||
<h3>(Finish a hotfix)</h3>
|
||||
|
||||
<p>Bir hata giderimi tamamlanırken, develop ve master dalları ile birleştirilir.
|
||||
Ayrıca master dalına (branch) hotfix versiyonunun etiketi eklenir.</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Komutlar (Commands)</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Içerik bilgisi (Backlog)</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Bu dökümanda Git flow için en önemli komutlar ve kullanımları ile ilgili bilgiler verilmektedir.
|
||||
Ancak tüm Git flow komutları burda bahsedilenlerle sınırlı değildir.</li>
|
||||
<li>Git flow kullanırken git ve gite ait diğer alt komutları gönlünüzce kullanabilirsiniz.
|
||||
Git flow sadece bir repo derleme-toplama aracıdır.
|
||||
</li>
|
||||
<li>Support branch hala beta sürümündedir.Kullanımı tavsiye edilmemektedir.</li>
|
||||
<li>Çevirilerinizle bize destek olabilirsiniz.Bunları projemize eklemekten mutluluk duyarız.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Yorumlar (Comments)</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // 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 = 'http://' + 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>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
417
index.uk_UK.html
Normal file
417
index.uk_UK.html
Normal file
@ -0,0 +1,417 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="uk" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>Шпаргалка по git-flow</title>
|
||||
|
||||
<!-- Lobster is same as Sansita but with cyrillic and another subsets. I recomend to use Lobster instead Sansita everywere-->
|
||||
<link href='http://fonts.googleapis.com/css?family=Lobster&subset=latin,cyrillic' rel='stylesheet' type='text/css'>
|
||||
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
<style>
|
||||
.title, h1, h2, h2 a, h3 {
|
||||
font-family: 'Lobster';
|
||||
}
|
||||
</style>
|
||||
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_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);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">Шпаргалка по git-flow</h1>
|
||||
|
||||
<p id="author">
|
||||
автор <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">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>
|
||||
<p id="desc">ефективне розгалуження з допомогою git-flow від <a href="http://nvie.com/">Vincent Driessen</a></p>
|
||||
<p id="translations">переклади:
|
||||
<a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="#" class="active" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Вступ</h2>
|
||||
|
||||
<p>
|
||||
git-flow — це набір розширень git, який надає доступ до високорівневих операцій над репозиторієм для підтримки моделі розгалуження Vincent
|
||||
Driessen.
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">дізнатись більше</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>Ця шпаргалка описує основні способи використання операцій git-flow.</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Загальні зауваження</h2>
|
||||
<ul>
|
||||
<li>Git flow надає чудовий додаток для командного рядкя, який має довідку і покращений вивід. Уважно читайте його, щоб знати, що відбувається...</li>
|
||||
<li>Клієнт для OSX/Windows <a href="http://www.sourcetreeapp.com/">Sourcetree</a> — чудовий GUI для Git — також підтримує git-flow
|
||||
</li>
|
||||
<li>Git-flow заснований на злитті. Для злиття гілок фіч не використовується rebase.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Встановлення</a></h2>
|
||||
<ul>
|
||||
<li>В першу чергу вам потрібна робоча установка git</li>
|
||||
<li>Git flow працює на OSX, Linux і Windows</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>OSX</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>Вам знадобиться wget і util-linux для установки git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Докладні інструкції для встановлення git flow дивіться на <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow
|
||||
wiki</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Перші кроки</a></h2>
|
||||
<p>Git flow порібно ініціалізувати, щоб налаштувати його для роботи з вашим репозиторієм.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Ініціалізація</h3>
|
||||
|
||||
<p>Щоб почати використовувати git-flow проініціалізуйте його в середині існуючого репозиторія:</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
Вам знадобиться відповісти на декілька запитань про те, яким чином іменувати ваші гілки.<br/>
|
||||
Рекомендується залишати значення по-замовчуванню.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Фічі</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Розробка нових фіч для подальших релізів</li>
|
||||
<li>Зазвичай існує тільки в репозиторіях розробників</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Початок нової фічі</h3>
|
||||
<p>Розробка нової фічі починається з гілки "develop".</p>
|
||||
<p>Для початку розробки нової фічі виконайте:</p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>Ця дія створить нову гілку фічі, засновану на гілці "develop", і переключається на неї.</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Завершення фічі</h3>
|
||||
|
||||
<p>
|
||||
Завершення розробки фічі.
|
||||
Ця дія виконується так:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Злиття гілки MYFEATURE в "develop"</li>
|
||||
<li>Видалення гілки фічі</li>
|
||||
<li>Переключення назад на гілку "develop"</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Публікація фічі</h3>
|
||||
|
||||
<p>
|
||||
Ви розробляєте фічу в команді? <br/>
|
||||
Опубулікуйте фічу на віддаленому сервері, щоб її могли використовувати Ваші колеги.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Отримання опублікованої фічі</h3>
|
||||
|
||||
<p>
|
||||
Отримання фічі, опублікованої іншим користувачем.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull origin MYFEATURE
|
||||
</blockquote>
|
||||
|
||||
<p>Ви можете відслідковувати фічу в репозиторії origin з допомогою команди <code> git flow feature track MYFEATURE</code></p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Створення релізу</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Підтримка підготовки нового релізу продукту</li>
|
||||
<li>Дозволяє усунути дрібні помилки і підготувати різноманітні метадані для реліза</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Початок релізу</h3>
|
||||
|
||||
<p>Щоб почати роботу над релізом використовуйте команду <code>git flow release</code>
|
||||
Вона створить гілку релізу, відгалужуючись від гілки "develop".
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p>За потреби ви может вказати <code>[BASE]</code>-комміт у вигляді його хешу sha-1, щоб почати реліз з нього.
|
||||
Цей комміт повинен належати гілці "develop".</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>Бажано одразу публікувати гілку релізу після створення, щоб інші користувачі мали змогу виконувати комміти в гілку релізу.
|
||||
Команда для публікації схожа на аналогічну команду для фіч:</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>Також можна відслідковувати віддалений реліз за допомогою команди <br/><code>git flow release track RELEASE</code></p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Завершення релізу</h3>
|
||||
|
||||
<p>Завершення релізу - один з найбільших кроків в git-розгалуженні. Під час цього відбувається декілька дій:</p>
|
||||
<ul>
|
||||
<li>Гілка релізу зливається в гілку "master"</li>
|
||||
<li>Реліз позначається тегом, який відповідає його імені</li>
|
||||
<li>Гілка релізу зливається назад в гілку "develop"</li>
|
||||
<li>Гілка релізу видаляється</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
<p>Не забувайте відправляти зміни в тегах за допмогою команди <code>git push --tags</code></p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Виправлення</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Виправлення потрібні тоді, коли є необхідність негайно усунути небажаний стан продакшн-версії продукту</li>
|
||||
<li>Може відгалужуватися від відповідного тегу на гілці "master", яким позначено випуск продакшн-версії</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Як і в випадку з іншими командами git flow, робота над виправленнями починається так:</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p>Аргумент VERSION визанчає назву нового, виправленого релізу.</p>
|
||||
<p>За потреби можна вказати BASENAME-комміт, від якого піде відгалуження.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Завершення виправлення</h3>
|
||||
|
||||
<p>Коли виправлення готове, воно зливається назад в гілки "develop" і "master".
|
||||
Крім того, комміт в гілці "master" позначється тегом з версією виправлення.</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Команди</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Останні зауваження</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Тут описані не всі доступні команди, а тільки найбільш важливі</li>
|
||||
<li>Ви також можете продовжувати використовувати git і всі його команди, git flow — це тільки набір додаткових інструментів</li>
|
||||
<li>Можливості "support"-гілок поки що тільки в beta-версії, користуватися ними не рекомендується</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Коментарі</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // 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 = 'http://' + 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>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
400
index.vi_VN.html
Normal file
400
index.vi_VN.html
Normal file
@ -0,0 +1,400 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>Tóm tắt Git-Flow</title>
|
||||
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
|
||||
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_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);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">Tóm tắt về Git-Flow</h1>
|
||||
|
||||
<p id="author">
|
||||
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">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>
|
||||
<p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p>
|
||||
<p id="translations">translations:
|
||||
<a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="#" class="active" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>git-flow là gì?</h2>
|
||||
|
||||
<p>
|
||||
git-flow là một tập các thao tác mở rộng của git nhằm cung cấp các thao tác repository (kho mã nguồn) ở mức cao dựa trên mô hình phân nhánh của Vincent Driessen.
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">xem chi tết ở đây</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>Bản tóm tắt nãy sẽ cho bạn biết cách sử dụng cơ bản và hiệu quả của git-flow.</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Một vài lời khuyên</h2>
|
||||
<ul>
|
||||
<li>Git flow cung cấp giao diện trợ giúp và đầu ra rất tuyệt vời. Hãy đọc chúng cẩn thận để xem điều kì diệu gì sẽ xảy ra ;)</li>
|
||||
<li>Git Client - <a href="http://www.sourcetreeapp.com/">Sourcetree</a> là một Git Client có giao diện GUI rất tiện lợi và cũng hỗ trợ luôn git-flow trên giao diện.</li>
|
||||
<li>Git-flow là một giải pháp dựa trên merge. Nó không rebase các nhánh tính năng.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">Cài đặt</a></h2>
|
||||
<ul>
|
||||
<li>Bạn cần cài đặt git trước khi có thể cài git-flow.</li>
|
||||
<li>Git flow có thể hoạt động trên OSX, Linux và Windows.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>OSX</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>Bạn cần wget và util-linux để cài đặt git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Xem chi tiết về cách cài đặt git flow ở trang sau: <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow
|
||||
wiki</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Bắt đầu nào</a></h2>
|
||||
<p>Git flow cần phải khởi tạo để có thể tùy chỉnh các cài đặt của dự án của bạn.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Khởi tạo</h3>
|
||||
|
||||
<p>Sau khi di chuyển tới thư mục dự án, chạy lệnh sau để khởi tạo git-flow.</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
Bạn sẽ cần trả lời một số câu hỏi cho việc thiết lập git-flow sau câu lệnh khởi tạo.
|
||||
Chúng tôi khuyên bạn nên sử dụng các giá trị [mặc định].
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">Các tính năng</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Phát triển các tính năng cho việc release sắp tới.</li>
|
||||
<li>Về cơ bản chỉ tổ chức ở repos của các lập trình viên.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>Bắt đầu một tính năng</h3>
|
||||
<p>Phát triển tính năng mới bắt đầu từ nhánh phát triển'develop'. Ví dụ với tính năng MYFEATURE:</p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>Lệnh này sẽ tạo ra một nhánh mới dựa trên nhánh 'develop' và chuyển sang nhánh mới này.</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
- Start committing last-minute fixes in preparing your release
|
||||
- When done, run:
|
||||
|
||||
git flow release finish 'testrelease'
|
||||
|
||||
|
||||
|
||||
-->
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Kết thúc một tính năng</h3>
|
||||
|
||||
<p>
|
||||
Sau khi phát triển xong một tính năng, lệnh kết thúc tính năng sẽ thực hiện các thao tác:
|
||||
</p>
|
||||
<ul>
|
||||
<li>Merge nhánh tính năng - MYFEATURE vào nhánh 'develop'</li>
|
||||
<li>Xoá nhánh tính năng</li>
|
||||
<li>Chuyển sang nhánh 'develop'</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Công bố tính năng</h3>
|
||||
|
||||
<p>
|
||||
Khi bạn làm việc với những người khác trên cùng một tính năng,
|
||||
bạn sẽ cần công bố phần mã nguồn của bạn cho tính năng đó lên remote
|
||||
để những người khác có thể cập nhập được.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Lấy về tính năng</h3>
|
||||
|
||||
<p>
|
||||
Pull mã nguồn của tính năng được cập nhập bởi những thành viên khác.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull REMOTE_NAME MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Tạo một bản release</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Hỗ trợ chuẩn bị cho bản release.</li>
|
||||
<li>Cho phép sửa các lỗi nhỏ và chuẩn bị meta-data cho release.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Bắt đầu release</h3>
|
||||
|
||||
<p>Để bắt đầu release, sử dụng lệnh release của git flow.</p>
|
||||
Lệnh này sẽ tạo ra nhánh 'release' từ nhánh 'develop'.
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p>Tùy chọn <code>[BASE]</code> cho phép commit được một giá trị hash sha-1. Trường hợp không chỉ định tùy chọn này thì HEAD sẽ được sử dụng.</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>Để công bố phần code 'release' của mình cho các thành viên khác, ta có thể làm tương tự như với công bố tính năng bằng lệnh sau:</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>(Bạn có thể theo dấu remote 'release' bằng lệnh <br/><code>git flow release track RELEASE</code> )</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Kết thúc release</h3>
|
||||
|
||||
<p>Kết thúc release là một bước lớn trong chiến lược phân nhánh git. Nó thực hiện các việc sau:</p>
|
||||
<ul>
|
||||
<li>Merge nhánh 'release' vào nhánh 'master'</li>
|
||||
<li>Gắn tag ở nhánh 'master' dành cho bản release</li>
|
||||
<li>Merge lại nhánh 'release' vào nhánh 'develop'</li>
|
||||
<li>Xóa bỏ nhánh 'release'</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">Sửa đổi nóng - hotfix</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Sử dụng cho các trường hợp khẩn cấp cần phải sửa đổi ngay trên bản sản phẩm (nhánh master).</li>
|
||||
<li>Có thể tạo nhánh giải quyết khẩn cấp từ tag của nhánh 'master'.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Bắt đầu hotfix</h3>
|
||||
|
||||
<p>Giống như các lệnh khác của git flow, hotfix bắt đầu với:</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p>Tham số VERSION ở đây chỉ định tên của phiên bản release hotfix này. Còn tham số tùy chọn basename sẽ chỉ định tên nhánh cơ bản thay cho hotfix thay vì nhánh 'master'</p>
|
||||
<p></p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Kết thúc hotfix</h3>
|
||||
|
||||
<p>Kết thúc hotfix sẽ merge lại nội dung thay đổi vào nhánh 'develop' và 'master'. Ở nhánh 'master' sẽ được gắn tag là phiên bản của hotfix.</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Các lệnh</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Lưu ý</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Ở đây không giới thiệu được tất cả các lệnh mà chỉ đưa ra một số lệnh quan trọng nhất của git-flow.</li>
|
||||
<li>Tất nhiên là bạn vẫn có thể sử dụng toàn bộ các lệnh thông thường của git. git-flow chỉ đơn giản là một tập hợp các lệnh mở rộng cho git.</li>
|
||||
<li>Chức năng nhánh 'support' vẫn đang là bản beta nên không được đề cập ở đây.</li>
|
||||
<li>Tôi rất sẵn sòng tích hợp bất kì bản dịch nào nếu bạn sẵn lòng :)</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Bình luận</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // 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 = 'http://' + 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>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
|
||||
</body>
|
||||
</html>
|
||||
371
index.zh_CN.html
Normal file
371
index.zh_CN.html
Normal file
@ -0,0 +1,371 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh-CN" xmlns="http://www.w3.org/1999/html">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<title>git-flow 备忘清单</title>
|
||||
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_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);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title" style="font-size: 80px;">git-flow 备忘清单</h1>
|
||||
|
||||
<p id="author">
|
||||
由 <a href="http://twitter.com/0r1g4m14dd1c7" target="_blank">Daniel Kummer (<a href="https://twitter.com/share" data-size="large">Tweet</a>)</a> 创建
|
||||
|
||||
</p>
|
||||
<p id="desc">使用 git-flow 进行有效的分支实践。 by <a href="http://nvie.com/" target="_blank">Vincent Driessen</a></p>
|
||||
<p id="translations">翻译:
|
||||
<a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="#" class="active" title="Simplified Chinese">简体中文(Simplified Chinese)</a>
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>关于</h2>
|
||||
|
||||
<p>
|
||||
git-flow 是一个 git 扩展集，按 Vincent Driessen 的分支模型提供高层次的库操作。
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">查看详情</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>这个备忘清单展示了 git-flow 的基本操作和效果。</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>基础建议</h2>
|
||||
<ul>
|
||||
<li>Git flow 提供了极出色的命令帮忙以及输出提示。请仔细阅读并观察发生了什么事情...</li>
|
||||
<li>OSX 程序 <a href="http://www.sourcetreeapp.com/">Sourcetree</a> 是一个极出色的 git 界面客户端，已经提供了 git-flow 的支持。 </li>
|
||||
<li>- Git-flow 是一个基于归并的解决方案，它并没有提供重置(rebase)特性分支的能力。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">安装</a></h2>
|
||||
<ul>
|
||||
<li>你需要有一个可以工作的 git 作为前提。 </li>
|
||||
<li>Git flow 可以工作在 OSX, Linux 和 Windows之下</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>OSX</h3>
|
||||
<span>Homebrew</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>Macports</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>安装 git-flow, 你需要 wget 和 util-linux。</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
更多的 git flow 安装指引，请阅读 <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation" target="_blank">git flow wiki</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">开始</a></h2>
|
||||
<p>为了自定义你的项目，Git flow 需要初始化过程。</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>初始化</h3>
|
||||
|
||||
<p>使用 git-flow，从初始化一个现有的 git 库内开始:</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
你必须回答几个关于分支的命名约定的问题。<br/>建议使用默认值。
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">特性</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>为即将发布的版本开发新功能特性。</li>
|
||||
<li>这通常只存在开发者的库中。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>增加新特性</h3>
|
||||
<p>新特性的开发是基于 'develop' 分支的。</p>
|
||||
<p>通过下面的命令开始开发新特性：</p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>这个操作创建了一个基于'develop'的特性分支，并切换到这个分支之下。</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>完成新特性</h3>
|
||||
|
||||
<p>完成开发新特性。这个动作执行下面的操作.
|
||||
</p>
|
||||
<ul>
|
||||
<li>合并 MYFEATURE 分支到 'develop'</li>
|
||||
<li>删除这个新特性分支</li>
|
||||
<li>切换回 'develop' 分支</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>发布新特性</h3>
|
||||
|
||||
<p>
|
||||
你是否合作开发一项新特性？<br/>
|
||||
发布新特性分支到远程服务器，所以，其它用户也可以使用这分支。
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>取得一个发布的新特性分支</h3>
|
||||
|
||||
<p>
|
||||
取得其它用户发布的新特性分支，并签出远程的变更。
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">作一个release版本</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>支持一个新的用于生产环境的发布版本。 </li>
|
||||
<li>允许修正小问题，并为发布版本准备元数据。 </li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>开始准备release版本</h3>
|
||||
|
||||
<p>开始准备release版本，使用 git flow release 命令. </p>
|
||||
它从 'develop' 分支开始创建一个 release 分支。
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p> 你可以选择提供一个 <code>[BASE]</code>参数，即提交记录的 sha-1 hash 值，来开启动 release 分支. 这个提交记录的 sha-1 hash 值必须是'develop' 分支下的。</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>创建 release 分支之后立即发布允许其它用户向这个 release 分支提交内容是个明智的做法。命令十分类似发布新特性：</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>(你可以通过 <br/><code>git flow release track RELEASE</code> 命令签出 release 版本的远程变更)</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>完成 release 版本</h3>
|
||||
|
||||
<p>完成 release 版本是一个大 git 分支操作。它执行下面几个动作： </p>
|
||||
<ul>
|
||||
<li>归并 release 分支到 'master' 分支</li>
|
||||
<li>用 release 分支名打 Tag</li>
|
||||
<li>归并 release 分支到 'develop'</li>
|
||||
<li>移除 release 分支</li>
|
||||
</ul>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">紧急修复</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>紧急修复来自这样的需求：生产环境的版本处于一个不预期状态，需要立即修正。 </li>
|
||||
<li> 有可能是需要修正 master 分支上某个 TAG 标记的生产版本。 </li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>开始 git flow 紧急修复</h3>
|
||||
|
||||
<p>像其它 git flow 命令一样, 紧急修复分支开始自：</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p> VERSION 参数标记着修正版本。你可以从 [BASENAME]开始，<code>[BASENAME]</code>为finish release时填写的版本号</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>完成紧急修复</h3>
|
||||
|
||||
<p>当完成紧急修复分支，代码归并回 develop 和 master 分支。相应地，master 分支打上修正版本的 TAG。</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">命令</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Backlog</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>并非所有可用的命令都涵盖在这里，这里包含有最重要的部分命令。 </li>
|
||||
<li>你依旧可以继续使用你所知道和了解的 git 命令， git flow 只是一个工具集合。</li>
|
||||
<li>'support' 功能只是测试版本, 不建议使用</li>
|
||||
<li>如果你乐意提供翻译，我很乐意整合它。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Comments</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // 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 = 'http://' + 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>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
384
index.zh_TW.html
Normal file
384
index.zh_TW.html
Normal file
@ -0,0 +1,384 @@
|
||||
<!doctype html>
|
||||
<html lang="zh-TW">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="x-ua-compatible" content="ie=edge">
|
||||
<title>git-flow 備忘清單</title>
|
||||
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
|
||||
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print">
|
||||
<link rel="stylesheet" href="css/style.zh_TW.css" type="text/css" media="screen,print">
|
||||
|
||||
<script src="js/jquery-1.7.2.min.js"></script>
|
||||
<script type="text/javascript">
|
||||
var _gaq = _gaq || [];
|
||||
_gaq.push(['_setAccount', 'UA-33766650-1']);
|
||||
_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);
|
||||
})();
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title" style="font-size: 80px;">git-flow 備忘清單</h1>
|
||||
|
||||
<p id="author">
|
||||
由 <a href="http://twitter.com/0r1g4m14dd1c7" target="_blank">Daniel Kummer (<a href="https://twitter.com/share" data-size="large">Tweet</a>)</a> 建立
|
||||
|
||||
</p>
|
||||
<p id="desc">使用 git-flow 進行高效率的分支使用。 by <a href="http://nvie.com/" target="_blank">Vincent Driessen</a></p>
|
||||
<p id="translations">翻譯:
|
||||
<a href="index.html" title="english">English</a> -
|
||||
<a href="index.es_ES.html" title="spanish">Castellano</a> -
|
||||
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
|
||||
<a href="#" class="active" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
|
||||
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a><br />
|
||||
<a href="index.ja_JP.html" title="日本語">日本語</a> -
|
||||
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
|
||||
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
|
||||
<a href="index.fr_FR.html" title="Français">Français</a> -
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
|
||||
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</a> -
|
||||
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> -
|
||||
<a href="index.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a> -
|
||||
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnamese)</a> -
|
||||
<a href="index.pl_PL.html" title="Polish">Polski</a> -
|
||||
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
|
||||
</p>
|
||||
</header>
|
||||
|
||||
<div id="main">
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>什麼是 git-flow ?</h2>
|
||||
|
||||
<p>
|
||||
git-flow 是一個 git 擴充功能，依照 Vincent Driessen 的分支模型提供高層次的倉庫控制方式。
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">查看更多</a></small>
|
||||
</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<p>這個備忘清單將會為您展示 git-flow 的基本操作方式與結果。</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>基礎提示</h2>
|
||||
<ul>
|
||||
<li>git-flow 提供了極為出色的指令與輸出提示。請仔細閱讀並觀察發生了什麼事情...</li>
|
||||
<li><a href="http://www.sourcetreeapp.com/">SourceTree</a> 是一個極為出色的 git 圖形介面應用程式，以內建了 git-flow 的功能。(支援 Mac OS X 與 Windows)</li>
|
||||
<li>git-flow 是一個以合並(Merge)概念為基底的解決方案，它並無提供重置(rebase)特性分支的功能。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="setup" href="#setup">安裝</a></h2>
|
||||
<ul>
|
||||
<li>你需要有一個已經初始化的 git 倉庫。</li>
|
||||
<li>git-flow 可以在 OSX、Linux 和 Windows 之下使用。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Mac OS X</h3>
|
||||
<span>透過 Homebrew 安裝</span>
|
||||
<blockquote>
|
||||
$ brew install git-flow-avh
|
||||
</blockquote>
|
||||
<span>透過 Macports 安裝</span>
|
||||
<blockquote>
|
||||
$ port install git-flow-avh
|
||||
</blockquote>
|
||||
<h3>Linux</h3>
|
||||
<blockquote>
|
||||
$ apt-get install git-flow
|
||||
</blockquote>
|
||||
<h3>Windows (Cygwin)</h3>
|
||||
<blockquote>
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash
|
||||
</blockquote>
|
||||
<p>在 Windows 下安装 git-flow, 你會需要 wget 和 util-linux。</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
更詳細的 git-flow 安裝指南，請參閱 <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation" target="_blank">git flow wiki</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">開始 git-flow</a></h2>
|
||||
<p>在開始使用 git-flow 之前，你必須完成一些簡單的設定。</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>初始化</h3>
|
||||
|
||||
<p>開始使用 git-flow 前，你必須切換目錄至你的 git 專案中，並且以下列指令進行初始化:</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
接著您必須回答幾個問題，是關於分支名稱的定義。<br/>這裡建議使用預設值。
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="initialize"></div>
|
||||
<div class="lines-small"></div>
|
||||
<div class="lines-open"></div>
|
||||
<div class="lines-big"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="features" href="#features">新功能分支(Feature)</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>為接下即將發佈的版本開發新功能時使用。</li>
|
||||
<li>通常新功能分支只會存於開發者機器上。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
|
||||
<div class="col-1">
|
||||
<h3>開始新功能設計</h3>
|
||||
<p>新功能的開發是由 'develop' 分支的最後一個版本發展出來的。</p>
|
||||
<p>使用下列的命令可以開始一個新功能的分支：</p>
|
||||
<blockquote>
|
||||
git flow feature start MYFEATURE
|
||||
</blockquote>
|
||||
<p>這個命令將會於 'develop' 的最後一個版本建立出另一個 'feature/MYFEATURE' 分支，並自動切換至這個分支底下。現在你可以開始製作新功能。</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>完成新功能</h3>
|
||||
|
||||
<p>當你在新功能分支完成新功能後，使用下列指令來結束新功能開發:
|
||||
</p>
|
||||
<blockquote>
|
||||
git flow feature finish MYFEATURE
|
||||
</blockquote>
|
||||
<p>這個指令會替你完成下列動作:
|
||||
<ul>
|
||||
<li>合並(Merge) MYFEATURE 分支回到 'develop'</li>
|
||||
<li>刪除這個新功能分支</li>
|
||||
<li>切換回 'develop' 分支</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>發佈新功能分支</h3>
|
||||
|
||||
<p>
|
||||
你是否需多人合作開發新功能？<br/>
|
||||
透過下列命令來發佈新功能分支到遠端 git 伺服器，讓其他使用者也能共用這個新功能分支。
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature publish MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-publish"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>取得新功能分支</h3>
|
||||
|
||||
<p>
|
||||
當你需接手完成新功能時，透過下列命令取得遠端伺服器上的新功能分支，並得到所有保存在遠端伺服器上的變更紀錄：
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull MYFEATURE
|
||||
</blockquote>
|
||||
|
||||
<p>
|
||||
你也可以透過下列指令進而追蹤一個功能:
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature track MYFEATURE
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="feature-pull"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">製作發佈版本(release)</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>用於支援準備發佈正式產品前的預備分支。</li>
|
||||
<li>允許修正小問題，並為發布版本準備或修改中介資料。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>開始推出新版本</h3>
|
||||
|
||||
<p>使用下列指令準備推出(release)新版本分支:</p>
|
||||
<blockquote>
|
||||
git flow release start RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p>
|
||||
它會從 'develop' 分支的最後一個版本創建出 release 分支。
|
||||
</p>
|
||||
<p>你也可以選擇性的加入一個 sha-1 hash 於<code>[BASE]</code>參數，這會讓 release 分支於您指定的 develop 提交紀錄點產生分支。有一點需要注意的是，sha-1 has 只能是於'develop' 分支下。</p>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<p>最佳的狀況下，在創建出新的 release 分支後，應要立即的發布至遠端伺服器上，讓其他團隊中的開發者也能存取這個 release 分支。而這個發布指令很類似於發布新功能:</p>
|
||||
<blockquote>
|
||||
git flow release publish RELEASE
|
||||
</blockquote>
|
||||
<p>(您也可以透過 <br/><code>git flow release track RELEASE</code> 指令來取得 release 版本的遠端更改)</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>完成推出新版本</h3>
|
||||
|
||||
<p>完成 release 版本是一個很大的 git 分支操作。但你只許要執行下列指令:</p>
|
||||
<blockquote>
|
||||
git flow release finish RELEASE
|
||||
</blockquote>
|
||||
<p>git flow 會幫你執行下面幾個步驟:</p>
|
||||
<ul>
|
||||
<li>合並 release 分支到 'master'</li>
|
||||
<li>在 master 加上版本號標籤<small>(Tag)</small></li>
|
||||
<li>合並 release 分支到 'develop'</li>
|
||||
<li>移除 release 分支</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="release-end"></div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="hotfixes" href="#hotfixes">快速修復(hotfix)</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>當你的產品發佈環境處於不可預期的狀況，且發生了一些需要立即修正的問題，您可以使用 hotfix 來幫助您。</li>
|
||||
<li>hotfix 是從 master 中加入的版本標籤開始。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>開始快速修復</h3>
|
||||
|
||||
<p>快速修復(hotfix)就像其他的 git flow 指令一樣，您可以透過下列指令開始：</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p>你必須填寫一個 VERSION 參數，這代表當你完成 hotfix 時發佈的版本號碼。</p>
|
||||
<p>此外你可以自由挑選修復開始的分支名稱<code>[BASENAME]</code>，分支名稱如果不填寫的狀況下，預設是 'master'。</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-start"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>完成快速修復</h3>
|
||||
|
||||
<p>當你在快速修復分支完成修復後，透過下列的指令讓修復分支合並回 develop 和 master 分支。並且在 master 分支加上修訂版本號的標籤(tag):</p>
|
||||
<blockquote>
|
||||
git flow hotfix finish VERSION
|
||||
</blockquote>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<div class="hotfix-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="col-1"></div>
|
||||
<div class="col-2">
|
||||
<div class="lines-close"></div>
|
||||
<div class="lines-small-end"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">指令一覽圖</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>備註</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>這裡我們只介紹了重要且常用的功能，並非包含所有的指令。</li>
|
||||
<li>git-flow 只是一個額外的擴充功能，即使安裝了 git-flow 後你依然可以使用你所知道的原生 git 指令。</li>
|
||||
<li>'support' 分支目前為測試版本不建議使用。</li>
|
||||
<li>如果你很樂意提供翻譯，我很樂意整合。</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">建議與回應</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
</footer>
|
||||
<script type="text/javascript">
|
||||
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
|
||||
var disqus_shortname = 'gitflowcheatsheet'; // 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 = 'http://' + disqus_shortname + '.disqus.com/embed.js';
|
||||
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript>請允許你的瀏覽器使用 JavaScript 才能看得到<a href="http://disqus.com/?ref_noscript">建議與回應 powered by Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Reference in New Issue
Block a user