extern/git-flow-cheatsheet
1
0
Fork 0
mirror of https://github.com/danielkummer/git-flow-cheatsheet.git synced 2025-04-22 01:58:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Translation: hungarian complete

Browse Source
This commit is contained in:
paul.andrei.ciocan 2024-12-12 12:44:12 +01:00
parent 85010abcad
commit d97d27f75b
27 changed files with 8477 additions and 6261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
index.an_AN.html
View File

@ -54,6 +54,7 @@
<a href="index.ja_JP.html" title="日本語">日本語</a> - <a href="index.ja_JP.html" title="日本語">日本語</a> -
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</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.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> - <a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -

455
index.ar_MA.html
View File

@ -1,174 +1,220 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="ar" xmlns="http://www.w3.org/1999/html"> <html lang="ar" xmlns="http://www.w3.org/1999/html">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>git-flow cheatsheet</title> <title>git-flow cheatsheet</title>
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'> <link
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print"> href="http://fonts.googleapis.com/css?family=Sansita+One"
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print"> rel="stylesheet"
<link rel="stylesheet" href="css/style.ar_MA.css" type="text/css" media="screen,print"> 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.ar_MA.css"
type="text/css"
media="screen,print"
/>
<script type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-33766650-1']); _gaq.push(["_setAccount", "UA-33766650-1"]);
_gaq.push(['_trackPageview']); _gaq.push(["_trackPageview"]);
(function () { (function () {
var ga = document.createElement('script'); var ga = document.createElement("script");
ga.type = 'text/javascript'; ga.type = "text/javascript";
ga.async = true; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; ga.src =
var s = document.getElementsByTagName('script')[0]; ("https:" == document.location.protocol
? "https://ssl"
: "http://www") + ".google-analytics.com/ga.js";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(ga, s); s.parentNode.insertBefore(ga, s);
})(); })();
</script> </script>
</head> </head>
<body> <body>
<div id="banner" style="direction: ltr;"><a href="https://github.com/danielkummer/git-flow-cheatsheet"> GitHub فرع في </a></div> <div id="banner" style="direction: ltr">
<header> <a href="https://github.com/danielkummer/git-flow-cheatsheet">
GitHub فرع في
</a>
</div>
<header>
<h1 id="title">git-flow cheatsheet</h1> <h1 id="title">git-flow cheatsheet</h1>
<p id="author"> <p id="author">
طور من طرف طور من طرف &nbsp;<a href="http://twitter.com/0r1g4m14dd1c7"
&nbsp;<a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>&nbsp; >Daniel Kummer</a
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">تويتر</a> >&nbsp;
<a
href="https://twitter.com/share"
class="twitter-share-button"
data-via="0r1g4m14dd1c7"
data-size="large"
>تويتر</a
>
<script>!function (d, s, id) { <script>
var js, fjs = d.getElementsByTagName(s)[0]; !(function (d, s, id) {
var js,
fjs = d.getElementsByTagName(s)[0];
if (!d.getElementById(id)) { if (!d.getElementById(id)) {
js = d.createElement(s); js = d.createElement(s);
js.id = id; js.id = id;
js.src = "//platform.twitter.com/widgets.js"; js.src = "//platform.twitter.com/widgets.js";
fjs.parentNode.insertBefore(js, fjs); fjs.parentNode.insertBefore(js, fjs);
} }
}(document, "script", "twitter-wjs");</script> })(document, "script", "twitter-wjs");
</script>
</p> </p>
<p id="desc"> <p id="desc">
كفاءة المتفرعة باستخدام git-flow من قبل كفاءة المتفرعة باستخدام git-flow من قبل
<a href="http://nvie.com/">Vincent Driessen</a></p> <a href="http://nvie.com/">Vincent Driessen</a>
<p id="translations">الترجمات: </p>
<a href="index.html" title="english">English</a> - <p id="translations">
الترجمات: <a href="index.html" title="english">English</a> -
<a href="index.es_ES.html" title="spanish">Castellano</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.pt_BR.html" title="Brazilian Portugues"
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - >Brazilian Portugues</a
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - >
<a href="index.ja_JP.html" title="日本語">日本語</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.tr_TR.html" title="Turkce">Türkçe</a> -
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</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.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</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.de_DE.html" title="German">Deutsch (German)</a> -
<a href="index.ca_CA.html" title="Català">Català (Catalan)</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.ro_RO.html" title="Romanian">Română (Romanian)</a> -
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> - <a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
<a href="index.uk_UA.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.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
<a href="index.pl_PL.html" title="Polish">Polski</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="#" title="العربية">العربية</a> - <a href="#" title="العربية">العربية</a> -
<a href="index.fa_FA.html" title="فارسی">فارسی</a> - <a href="index.fa_FA.html" title="فارسی">فارسی</a> -
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a> <a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
</p> </p>
</header> </header>
<div id="main"> <div id="main">
<div class="scrollblock" dir="rtl">
<div class="scrollblock" dir="rtl">
<h2>حول</h2> <h2>حول</h2>
<p> <p>
git-flow هي إضافات لـ git لتوفير عمليات متطورة على المستودع لنموذج الفروع لفانسين دريسنز. git-flow هي إضافات لـ git لتوفير عمليات متطورة على المستودع لنموذج
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">للمزيد</a></small> الفروع لفانسين دريسنز.
<small
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
>للمزيد</a
></small
>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p> هذه المذكرة تشرح أساسيات استعمال عمليات git-flow وتأثيراتها. </p> <p>هذه المذكرة تشرح أساسيات استعمال عمليات git-flow وتأثيراتها.</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>نصائح أساسية</h2> <h2>نصائح أساسية</h2>
<ul> <ul>
<li> <li>
أوامر ومخرجات الـ git-flow توفر تسهيلات مهمة جدا. إقرأها بعناية لكي تفهم ماذا يحدث... أوامر ومخرجات الـ git-flow توفر تسهيلات مهمة جدا. إقرأها بعناية لكي
تفهم ماذا يحدث...
</li> </li>
<li> <li>
يعتبر تطبيق الـ macOS/Windows <a href="http://www.sourcetreeapp.com/">سورستري</a> يعتبر تطبيق الـ macOS/Windows
<a href="http://www.sourcetreeapp.com/">سورستري</a>
واجهة مستخدم ممتازة لـ git الذي يدعم git-flow. واجهة مستخدم ممتازة لـ git الذي يدعم git-flow.
</li> </li>
<li> <li>
Git-flow هي حل مبني على عمليات الدمج. التي لاتترك قاعدة على الفروع الوظيفية. Git-flow هي حل مبني على عمليات الدمج. التي لاتترك قاعدة على الفروع
الوظيفية.
</li> </li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="setup" href="#setup">التنصيب</a></h2> <h2><a name="setup" href="#setup">التنصيب</a></h2>
<ul> <ul>
<li> <li>تحتاج إلى تنصيب git متوفر كشرط أساسي.</li>
تحتاج إلى تنصيب git متوفر كشرط أساسي.
</li>
<li>Git flow يعمل في كل من macOS، الينوكس والويندوز.</li> <li>Git flow يعمل في كل من macOS، الينوكس والويندوز.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>macOS</h3> <h3>macOS</h3>
<span>Homebrew</span> <span>Homebrew</span>
<blockquote> <blockquote>$ brew install git-flow-avh</blockquote>
$ brew install git-flow-avh
</blockquote>
<span>Macports</span> <span>Macports</span>
<blockquote> <blockquote>$ port install git-flow-avh</blockquote>
$ port install git-flow-avh
</blockquote>
<h3>لينُكس</h3> <h3>لينُكس</h3>
<blockquote> <blockquote>$ apt-get install git-flow</blockquote>
$ apt-get install git-flow
</blockquote>
<h3>ويندوز (Cygwin)</h3> <h3>ويندوز (Cygwin)</h3>
<blockquote> <blockquote>
$ wget -q -O - --no-check-certificate $ wget -q -O - --no-check-certificate
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
install stable | bash
</blockquote> </blockquote>
<p> ستحتاج إلى wget و util-linux لكي تقوم بتنصيب git-flow. </p> <p>ستحتاج إلى wget و util-linux لكي تقوم بتنصيب git-flow.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p style="direction: rtl;"> <p style="direction: rtl">
لتفسير مفصل عن التنصيب زر موقع <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow wiki</a>. لتفسير مفصل عن التنصيب زر موقع
<a
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
>git flow wiki</a
>.
</p> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow" />
</div>
</div> </div>
</div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">الشروع في العمل</a></h2> <h2>
<p style="direction: rtl;"> <a name="getting_started" href="#getting_started">الشروع في العمل</a>
</h2>
<p style="direction: rtl">
Git flow .يحتاج للتهييئة كي تخصص تنصيب مشروعك Git flow .يحتاج للتهييئة كي تخصص تنصيب مشروعك
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>التهييئة</h3> <h3>التهييئة</h3>
<p>ابدأ باستعمال git-flow عن طريق التهييئة داخل مستودع git موفر.</p>
<blockquote>git flow init</blockquote>
<p> <p>
ابدأ باستعمال git-flow عن طريق التهييئة داخل مستودع git موفر. ستحتاج إلى الإجابة عن بعض الأسئلة المتعلقة بنظام تسمية فروعك.<br />
</p>
<blockquote>
git flow init
</blockquote>
<p>
ستحتاج إلى الإجابة عن بعض الأسئلة المتعلقة بنظام تسمية فروعك.<br/>
من المستحسن استخدام القيم الافتراضية. من المستحسن استخدام القيم الافتراضية.
</p> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="initialize"></div> <div class="initialize"></div>
@ -176,35 +222,22 @@
<div class="lines-open"></div> <div class="lines-open"></div>
<div class="lines-big"></div> <div class="lines-big"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock"> <h2><a name="features" href="#features"> ميزات Features </a></h2>
<h2><a name="features" href="#features">
ميزات Features
</a></h2>
<ul class="narrow"> <ul class="narrow">
<li> <li>طور ميزات جديدة للإصدارات القادمة.</li>
طور ميزات جديدة للإصدارات القادمة. <li>توجد عادة في مستودع المبرمجين فقط.</li>
</li>
<li>
توجد عادة في مستودع المبرمجين فقط.
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>بدء ميزة جديدة</h3> <h3>بدء ميزة جديدة</h3>
<p> <p>تبدأ عملية برمجة ميزات جديدة انطلاقا من فرع 'develop'.</p>
تبدأ عملية برمجة ميزات جديدة انطلاقا من فرع 'develop'. <p>إبدأ عملية برمجة ميزة جديدة بتنفيذ الأمر</p>
</p> <blockquote>git flow feature start MYFEATURE</blockquote>
<p>
إبدأ عملية برمجة ميزة جديدة بتنفيذ الأمر
</p>
<blockquote>
git flow feature start MYFEATURE
</blockquote>
<p> <p>
هذه العملية تصنع فرع ميزة جديد انطلاقا من فرع 'develop' وينتقل إليه. هذه العملية تصنع فرع ميزة جديد انطلاقا من فرع 'develop' وينتقل إليه.
</p> </p>
@ -218,161 +251,138 @@
--> --></div>
</div>
<div class="col-2"> <div class="col-2">
<div class="feature-start"></div> <div class="feature-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>إتمام الميزة</h3> <h3>إتمام الميزة</h3>
<p> <p>إتمام تطوير ميزة. هذه العملية تقوم بتنفيذ ما يلي:</p>
إتمام تطوير ميزة. هذه العملية تقوم بتنفيذ ما يلي:
</p>
<ul> <ul>
<li> <li>دمج MYFEATURE نحو فرع 'develop'</li>
دمج MYFEATURE نحو فرع 'develop' <li>تحذف فرع الميزة.</li>
</li> <li>تحول إلى فرع 'develop'</li>
<li>
تحذف فرع الميزة.
</li>
<li>
تحول إلى فرع 'develop'
</li>
</ul> </ul>
<blockquote> <blockquote>git flow feature finish MYFEATURE</blockquote>
git flow feature finish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-end"></div> <div class="feature-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>نشر ميزة</h3> <h3>نشر ميزة</h3>
<p> <p>
هل تقوم بتطوير ميزة بالتعاون مع مجموعة مبرمجين؟ هل تقوم بتطوير ميزة بالتعاون مع مجموعة مبرمجين؟
<br/> <br />
أنشر الميزة إلى نطاق السيرفر لكي يستطيع بقية المبرمجين استخدامها. أنشر الميزة إلى نطاق السيرفر لكي يستطيع بقية المبرمجين استخدامها.
</p> </p>
<blockquote> <blockquote>git flow feature publish MYFEATURE</blockquote>
git flow feature publish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-publish"></div> <div class="feature-publish"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>الحصول على ميزة منشورة</h3> <h3>الحصول على ميزة منشورة</h3>
<p>الحصول على ميزة منشورة من طرف مستخدم آخر.</p>
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
<p> <p>
الحصول على ميزة منشورة من طرف مستخدم آخر. يمكنك تتبع ميزة على الأصل باستخدام
<code> git flow feature track MYFEATURE</code>
</p> </p>
<blockquote>
git flow feature pull origin MYFEATURE
</blockquote>
<p>يمكنك تتبع ميزة على الأصل باستخدام <code> git flow feature track MYFEATURE</code> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock"> <h2>
<h2><a name="release" href="#release" style="direction: rtl"> اصنع إصدارا Release</a></h2> <a name="release" href="#release" style="direction: rtl">
اصنع إصدارا Release</a
>
</h2>
<ul> <ul>
<li> <li>دعم إعداد إنتاج اصدار جديد.</li>
دعم إعداد إنتاج اصدار جديد. <li>السماح باصلاحات أخطاء طفيفة وإعداد بيانات وصفية لإصدار.</li>
</li>
<li>
السماح باصلاحات أخطاء طفيفة وإعداد بيانات وصفية لإصدار.
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>إبدأ الإصدار</h3> <h3>إبدأ الإصدار</h3>
<p> <p>
لكي تبدأ إصدارا استخدم أوامر الإصدار لـ git flow. أنشىء فرع إصدار إنطلاقا من فرع 'develop' لكي تبدأ إصدارا استخدم أوامر الإصدار لـ git flow. أنشىء فرع إصدار
إنطلاقا من فرع 'develop'
</p> </p>
<blockquote style="direction: ltr;"> <blockquote style="direction: ltr">
git flow release start RELEASE [BASE] git flow release start RELEASE [BASE]
</blockquote> </blockquote>
<p>يمكنك اختياريا اضافة التوريد <code>[BASE]</code> ايداع sha-1 hash كي تبدأ من خلالها الإصدار. <p>
الإيداع يجب أن يكون في فرع 'develop' يمكنك اختياريا اضافة التوريد <code>[BASE]</code> ايداع sha-1 hash كي
تبدأ من خلالها الإصدار. الإيداع يجب أن يكون في فرع 'develop'
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p> <p>
من الأفضل نشر فرع الإصدار بعد إنشائه للسماح للمبرمجين بإيداع الإصدار. قم بنفس الشيء للميزات المنشورة باستخدام الأمر: من الأفضل نشر فرع الإصدار بعد إنشائه للسماح للمبرمجين بإيداع
الإصدار. قم بنفس الشيء للميزات المنشورة باستخدام الأمر:
</p>
<blockquote>git flow release publish RELEASE</blockquote>
<p>
يمكنك متابعة الاصدار على السرفر باستخدام <br /><code
>git flow release track RELEASE</code
>
</p> </p>
<blockquote>
git flow release publish RELEASE
</blockquote>
<p>يمكنك متابعة الاصدار على السرفر باستخدام <br/><code>git flow release track RELEASE</code> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>إتمام إصدار</h3> <h3>إتمام إصدار</h3>
<p> <p>إتمام إصدار هي من أهم الخطوات في فروع git.</p>
إتمام إصدار هي من أهم الخطوات في فروع git.
</p>
<ul> <ul>
<li> <li>دمج فرع الإصدار نحو فرع 'master'</li>
دمج فرع الإصدار نحو فرع 'master' <li>تسمية فرع الإصدار باسمه.</li>
</li> <li>رجع دمج فرع الإصدار نحو فرع 'develop'</li>
<li> <li>حذف فرع الإصدار</li>
تسمية فرع الإصدار باسمه.
</li>
<li>
رجع دمج فرع الإصدار نحو فرع 'develop'
</li>
<li>
حذف فرع الإصدار
</li>
</ul> </ul>
<blockquote> <blockquote>git flow release finish RELEASE</blockquote>
git flow release finish RELEASE
</blockquote>
<p>لا تنسى دفع مسمياتك بتنفيذ<code>git push --tags</code></p> <p>لا تنسى دفع مسمياتك بتنفيذ<code>git push --tags</code></p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-end"></div> <div class="release-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes"> الإصلاحات Hotfixes </a></h2> <h2><a name="hotfixes" href="#hotfixes"> الإصلاحات Hotfixes </a></h2>
<ul> <ul>
<li> <li>
تنشأ الإصلاحات من ضرورة العمل فورا على حالة غير مرغوب فيها من نسخة الانتاج الحية. تنشأ الإصلاحات من ضرورة العمل فورا على حالة غير مرغوب فيها من نسخة
الانتاج الحية.
</li> </li>
<li> <li>
يمكن الاعتماد على تسمية فرع الإنتاج 'master' لإشارة على نسخة الإنتج الحية. يمكن الاعتماد على تسمية فرع الإنتاج 'master' لإشارة على نسخة الإنتج
الحية.
</li> </li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
@ -380,90 +390,91 @@
<h3>بدأ إصلاح</h3> <h3>بدأ إصلاح</h3>
<p>كمثل أوامر git flow الأخرى تبدأ إصلاح بالأمر:</p> <p>كمثل أوامر git flow الأخرى تبدأ إصلاح بالأمر:</p>
<blockquote> <blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
git flow hotfix start VERSION [BASENAME]
</blockquote>
<p> <p>
يمثل المعامل VERSION اسم الإصلاح الجديد. اختياريا يمكنك تحديد basename أي إصدار يطبق الإصلاح. يمثل المعامل VERSION اسم الإصلاح الجديد. اختياريا يمكنك تحديد
basename أي إصدار يطبق الإصلاح.
</p> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>إنهاء الإصلاح</h3> <h3>إنهاء الإصلاح</h3>
<p> <p>
عند الانتهاء من الإصلاح فإنه يتم دمجها نحو develop و master. بالإضافة إلى ذلك يتم تسمية دمج master بنسخة الإصلاح. عند الانتهاء من الإصلاح فإنه يتم دمجها نحو develop و master.
بالإضافة إلى ذلك يتم تسمية دمج master بنسخة الإصلاح.
</p> </p>
<blockquote> <blockquote>git flow hotfix finish VERSION</blockquote>
git flow hotfix finish VERSION
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-end"></div> <div class="hotfix-end"></div>
</div> </div>
</div> </div>
<div> <div>
<div class="col-1"></div> <div class="col-1"></div>
<div class="col-2"> <div class="col-2">
<div class="lines-close"></div> <div class="lines-close"></div>
<div class="lines-small-end"></div> <div class="lines-small-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="commands" href="#commands">الأوامر</a></h2> <h2><a name="commands" href="#commands">الأوامر</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands" />
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2> الأعمال المعلقة</h2> <h2>الأعمال المعلقة</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>ليست كل الأوامر مذكورة هنا، فقط الأساسية.</li> <li>ليست كل الأوامر مذكورة هنا، فقط الأساسية.</li>
<li> <li>
يمكنك الاستمرار في استخدام git وجميع الأوامر بشكل طبيعي كما عاهدتهم، git flow ليست سوى مجموعة أدوات يمكنك الاستمرار في استخدام git وجميع الأوامر بشكل طبيعي كما عاهدتهم،
git flow ليست سوى مجموعة أدوات
</li> </li>
<li>ميزة "دعم" لا تزال بيتا، لا ينصح باستخدامها.</li> <li>ميزة "دعم" لا تزال بيتا، لا ينصح باستخدامها.</li>
<li>إذا كنت تريد إضافة ترجمة لهذه الوثيقة، سوف أدرجها بكل سرور.</li> <li>إذا كنت تريد إضافة ترجمة لهذه الوثيقة، سوف أدرجها بكل سرور.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
</div> </div>
<footer>
<footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">تعليقات</a></h2> <h2><a name="comments" href="#comments">تعليقات</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>
</footer> </footer>
<script type="text/javascript"> <script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */ /* * * DON'T EDIT BELOW THIS LINE * * */
(function () { (function () {
var dsq = document.createElement('script'); var dsq = document.createElement("script");
dsq.type = 'text/javascript'; dsq.type = "text/javascript";
dsq.async = true; dsq.async = true;
dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js'; dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); (
document.getElementsByTagName("head")[0] ||
document.getElementsByTagName("body")[0]
).appendChild(dsq);
})(); })();
</script> </script>
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a> <noscript
</noscript> >Please enable JavaScript to view the
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a> <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
</noscript>
<a href="http://disqus.com" class="dsq-brlink"
</body> >comments powered by <span class="logo-disqus">Disqus</span></a
>
</body>
</html> </html>

446
index.az_AZ.html
View File

@ -1,106 +1,167 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns="http://www.w3.org/1999/html"> <html lang="en" xmlns="http://www.w3.org/1999/html">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>git-flow soraqçası</title> <title>git-flow soraqçası</title>
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'> <link
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print"> href="http://fonts.googleapis.com/css?family=Sansita+One"
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print"> 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 src="js/jquery-1.7.2.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-33766650-1']); _gaq.push(["_setAccount", "UA-33766650-1"]);
_gaq.push(['_trackPageview']); _gaq.push(["_trackPageview"]);
(function () { (function () {
var ga = document.createElement('script'); var ga = document.createElement("script");
ga.type = 'text/javascript'; ga.type = "text/javascript";
ga.async = true; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; ga.src =
var s = document.getElementsByTagName('script')[0]; ("https:" == document.location.protocol
? "https://ssl"
: "http://www") + ".google-analytics.com/ga.js";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(ga, s); s.parentNode.insertBefore(ga, s);
})(); })();
</script> </script>
</head> </head>
<body> <body>
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div> <div id="banner">
<header> <a href="https://github.com/danielkummer/git-flow-cheatsheet"
>Fork me on GitHub</a
>
</div>
<header>
<h1 id="title">git-flow soraqçası</h1> <h1 id="title">git-flow soraqçası</h1>
<p id="author"> <p id="author">
<a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> tərəfindən yaradılıb <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> tərəfindən
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a> yaradılıb
<script>!function (d, s, id) { <a
var js, fjs = d.getElementsByTagName(s)[0]; 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)) { if (!d.getElementById(id)) {
js = d.createElement(s); js = d.createElement(s);
js.id = id; js.id = id;
js.src = "//platform.twitter.com/widgets.js"; js.src = "//platform.twitter.com/widgets.js";
fjs.parentNode.insertBefore(js, fjs); fjs.parentNode.insertBefore(js, fjs);
} }
}(document, "script", "twitter-wjs");</script> })(document, "script", "twitter-wjs");
</script>
</p> </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="desc">
<p id="translations">translations: <a href="http://nvie.com/">Vincent Driessen</a> tərəfindən git-flow
<a href="#" class="active" title="english">English</a> - 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.es_ES.html" title="spanish">Castellano</a> -
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> - <a href="index.pt_BR.html" title="Brazilian Portugues"
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - >Brazilian Portugues</a
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - >
<a href="index.ja_JP.html" title="日本語">日本語</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.tr_TR.html" title="Turkce">Türkçe</a> -
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</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.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</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.de_DE.html" title="German">Deutsch (German)</a> -
<a href="index.ca_CA.html" title="Català">Català (Catalan)</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.ro_RO.html" title="Romanian">Română (Romanian)</a> -
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</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.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a>
<a href="index.pl_PL.html" title="Polish">Polski</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.fa_FA.html" title="فارسی">فارسی</a> - <a href="index.fa_FA.html" title="فارسی">فارسی</a> -
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a> <a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a> <a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
</p> </p>
</header> </header>
<div id="main"> <div id="main">
<div class="scrollblock">
<div class="scrollblock">
<h2>Haqqında</h2> <h2>Haqqında</h2>
<p> <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. Git-flow depo üzərində Vincent Driessen'in budaqlanma modeli üzrə
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">ətraflı</a></small> 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>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>Bu soraqça git-flow əməliyyatlarının istifadəsinin əsaslarını və effektini göstərir</p> <p>
Bu soraqça git-flow əməliyyatlarının istifadəsinin əsaslarını və
effektini göstərir
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Əsas ipucuları</h2> <h2>Əsas ipucuları</h2>
<ul> <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>
<li>macOS/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> Git-flow möhtəşəm kömək və çıxış imkanı verir. Nə baş verdiyini
<li>Git-flow birləşmə əsaslı həlldir. O xüsusiyyət budaqlarını birləşdirmək üçün rebase istifadə etmir.</li> görmək üçün onu diqqətlə oxuyun ...
</li>
<li>
macOS/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> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="setup" href="#setup">Quraşdırılması</a></h2> <h2><a name="setup" href="#setup">Quraşdırılması</a></h2>
<ul> <ul>
<li>Öncədən git'in quraşdırılması, işlək olması şərtdir.</li> <li>Öncədən git'in quraşdırılması, işlək olması şərtdir.</li>
@ -110,54 +171,56 @@
<div class="col-1"> <div class="col-1">
<h3>macOS</h3> <h3>macOS</h3>
<span>Homebrew</span> <span>Homebrew</span>
<blockquote> <blockquote>$ brew install git-flow-avh</blockquote>
$ brew install git-flow-avh
</blockquote>
<span>Macports</span> <span>Macports</span>
<blockquote> <blockquote>$ port install git-flow-avh</blockquote>
$ port install git-flow-avh
</blockquote>
<h3>Linux</h3> <h3>Linux</h3>
<span>Debian əsaslı distributivlər</span> <span>Debian əsaslı distributivlər</span>
<blockquote> <blockquote>$ apt-get install git-flow</blockquote>
$ apt-get install git-flow
</blockquote>
<span>Red Hat əsaslı distributivlər</span> <span>Red Hat əsaslı distributivlər</span>
<blockquote> <blockquote>$ yum install gitflow</blockquote>
$ yum install gitflow
</blockquote>
<h3>Windows (Cygwin)</h3> <h3>Windows (Cygwin)</h3>
<blockquote> <blockquote>
$ wget -q -O - --no-check-certificate $ wget -q -O - --no-check-certificate
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
install stable | bash
</blockquote> </blockquote>
<p>Git-flow quraşdırmaq üçün wget və util-linux alətləri lazımdır.</p> <p>Git-flow quraşdırmaq üçün wget və util-linux alətləri lazımdır.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <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 Git-flow'nun detallı quraşdırılma addımları üçün zəhmət olmasa
wiki</a> səhifəsinə daxil olun. <a
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
>git flow wiki</a
>
səhifəsinə daxil olun.
</p> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow" />
</div>
</div> </div>
</div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">Başlayarkən</a></h2> <h2>
<p>Layihənizin ilkin tənzimlənməsi üçün git-flow'nun başladılması lazımdır.</p> <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">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Başladılma</h3> <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> <p>
Budaqlarınızın adlandırma konvensiyasıyla bağlı bir neçə suala cavab verməli olacaqsınız.<br/> 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. Öncədən təyin edilmiş qiymətlər istifadə etmək tövsiyyə olunur.
</p> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="initialize"></div> <div class="initialize"></div>
@ -165,10 +228,9 @@
<div class="lines-open"></div> <div class="lines-open"></div>
<div class="lines-big"></div> <div class="lines-big"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="features" href="#features">Xüsusiyyətlər</a></h2> <h2><a name="features" href="#features">Xüsusiyyətlər</a></h2>
<ul class="narrow"> <ul class="narrow">
@ -181,11 +243,12 @@
<h3>Yeni xüsusiyyət başladın</h3> <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ətlərin tərtibatı 'develop' budağından başlayır.</p>
<p>Yeni xüsusiyyətin tərtibatına</p> <p>Yeni xüsusiyyətin tərtibatına</p>
<blockquote> <blockquote>git flow feature start MYFEATURE</blockquote>
git flow feature start MYFEATURE
</blockquote>
<p>ilə başlayın</p> <p>ilə başlayın</p>
<p>Bu əmr 'develop' əsasında yeni xüsusiyyət budağı yaradır və ona qoşulur</p> <p>
Bu əmr 'develop' əsasında yeni xüsusiyyət budağı yaradır və ona
qoşulur
</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -196,20 +259,19 @@
--> --></div>
</div>
<div class="col-2"> <div class="col-2">
<div class="feature-start"></div> <div class="feature-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Xüsusiyyəti tamamlayın</h3> <h3>Xüsusiyyəti tamamlayın</h3>
<p> <p>
Xüsusiyyətin tərtibatını tamamlayın. Xüsusiyyətin tərtibatını tamamlayın. Bu əmr aşağıdakılarını yerinə
Bu əmr aşağıdakılarını yerinə yetirir: yetirir:
</p> </p>
<ul> <ul>
<li>MYFEATURE budağını 'develop' budağına birləşdirir</li> <li>MYFEATURE budağını 'develop' budağına birləşdirir</li>
@ -217,195 +279,227 @@
<li>'develop' budağına qoşulur</li> <li>'develop' budağına qoşulur</li>
</ul> </ul>
<blockquote> <blockquote>git flow feature finish MYFEATURE</blockquote>
git flow feature finish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-end"></div> <div class="feature-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Xüsusiyyəti yayımlayın</h3> <h3>Xüsusiyyəti yayımlayın</h3>
<p> <p>
Xüsusiyyəti birlikdə tərtib edirsiniz? <br/> 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. Tərtib etdiyiniz xüsusiyyəti kənar serverə yayımlayın ki, digər
istifadəçilər ondan yararlana bilsinlər.
</p> </p>
<blockquote> <blockquote>git flow feature publish MYFEATURE</blockquote>
git flow feature publish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-publish"></div> <div class="feature-publish"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Yayımlanmış xüsusiyyətin əldə olunması</h3> <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> <p>
Digər istifadəçinin yayımladığı xüsusiyyəti əldə edin. Xüsusiyyəti origin deposunda aşağıdakı əmrlə izləyə bilərsiniz
<code> git flow feature track MYFEATURE</code>
</p> </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>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="release" href="#release">Buraxılış yaradın</a></h2> <h2><a name="release" href="#release">Buraxılış yaradın</a></h2>
<ul> <ul>
<li>Yeni buraxılışa hazırlıqda kömək edir.</li> <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> <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> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Buraxılışa başlayın</h3> <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> <p>
<blockquote> Buraxılışa başlamaq üçün git flow release əmrindən istifadə edin. O
git flow release start RELEASE [BASE] 'develop' budağı əsasında buraxılış budağını yaradır.
</blockquote> </p>
<p>İstədiyiniz halda <code>[BASE]</code> - kommitin sha-1 heşini verməklə buraxılışa burdan başlaya bilərsiniz. <blockquote>git flow release start RELEASE [BASE]</blockquote>
Bu kommit 'develop' budağında olmalıdır.</p> <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">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</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> <p>
<blockquote> Digər tərtibatçıların da buraxılış kommitlərinə imkan yaratmaq üçün,
git flow release publish RELEASE buraxılış budağı yaradıldıqdan dərhal sonra yayımlanması yaxşı
</blockquote> olardı. Bunu aşağıdakı əmrlə, xüsusiyyət yayımlanmasına bənzər
<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> şə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>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Buraxılışı tamamlayın</h3> <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> <p>
Buraxılışın tamamlanması git budaqlanmsında böyük addımlardan
biridir. O aşağıdakıları yerinə yetirir:
</p>
<ul> <ul>
<li>Buraxılış budağını 'master' budağına birləşdirir</li> <li>Buraxılış budağını 'master' budağına birləşdirir</li>
<li>Buraxılışı adına uyğun teqləyir</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ğı geriyə, 'develop' budağına birləşir</li>
<li>Buraxılış budağı silinir</li> <li>Buraxılış budağı silinir</li>
</ul> </ul>
<blockquote> <blockquote>git flow release finish RELEASE</blockquote>
git flow release finish RELEASE <p>
</blockquote> <code>git push --tags</code> əmri ilə teqlərinizi göndərməyi
<p><code>git push --tags</code> əmri ilə teqlərinizi göndərməyi unutmayın</p> unutmayın
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-end"></div> <div class="release-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">Düzəlişlər</a></h2> <h2><a name="hotfixes" href="#hotfixes">Düzəlişlər</a></h2>
<ul> <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>
<li>Hazır versiyaya uyğun master budağındakı teqdən budaqlana bilər.</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> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>git flow hotfix start</h3> <h3>git flow hotfix start</h3>
<p>Digət git flow əmrləri kimi düzəliş</p> <p>Digət git flow əmrləri kimi düzəliş</p>
<blockquote> <blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
git flow hotfix start VERSION [BASENAME]
</blockquote>
<p>ilə başlayır</p> <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> <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>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Düzəlişi tamamlayın</h3> <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> <p>
<blockquote> Düzəliş tamamlandığı halda o 'develop' və 'master' budaqlarına
git flow hotfix finish VERSION birləşir. Əlavə olaraq 'master' budağına birləşmə düzəlişin
</blockquote> versiyası ilə teqlənir.
</p>
<blockquote>git flow hotfix finish VERSION</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-end"></div> <div class="hotfix-end"></div>
</div> </div>
</div> </div>
<div> <div>
<div class="col-1"></div> <div class="col-1"></div>
<div class="col-2"> <div class="col-2">
<div class="lines-close"></div> <div class="lines-close"></div>
<div class="lines-small-end"></div> <div class="lines-small-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="commands" href="#commands">Əmrlər</a></h2> <h2><a name="commands" href="#commands">Əmrlər</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands" />
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Qeyd və qalıqlar</h2> <h2>Qeyd və qalıqlar</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Bura bütün mövcud əmrlər deyil, ən vacibləri qeyd edilmişdir</li> <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>
<li>'support' imkanı hələ beta versiyasındadır, istifadəsi tövsiyə olunmur</li> Siz hələ də git və onun əmrlərini bildiyniz, normal qaydada istifadə
<li>Əgər siz tərcümələr təqdim etmək istəsəniz, onları qoşmaqda məmnun olaram</li> 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> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
</div> </div>
<footer>
<footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Şərhlər</a></h2> <h2><a name="comments" href="#comments">Şərhlər</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>
</footer> </footer>
<script type="text/javascript"> <script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */ /* * * DON'T EDIT BELOW THIS LINE * * */
(function () { (function () {
var dsq = document.createElement('script'); var dsq = document.createElement("script");
dsq.type = 'text/javascript'; dsq.type = "text/javascript";
dsq.async = true; dsq.async = true;
dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js'; dsq.src = "http://" + disqus_shortname + ".disqus.com/embed.js";
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); (
document.getElementsByTagName("head")[0] ||
document.getElementsByTagName("body")[0]
).appendChild(dsq);
})(); })();
</script> </script>
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a> <noscript
</noscript> >Please enable JavaScript to view the
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a> <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
</noscript>
<a href="http://disqus.com" class="dsq-brlink"
</body> >comments powered by <span class="logo-disqus">Disqus</span></a
>
</body>
</html> </html>

461
index.ca_CA.html
View File

@ -1,159 +1,228 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="ca" xmlns="http://www.w3.org/1999/html"> <html lang="ca" xmlns="http://www.w3.org/1999/html">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>git-flow cheatsheet</title> <title>git-flow cheatsheet</title>
<link href='https://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'> <link
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print"> href="https://fonts.googleapis.com/css?family=Sansita+One"
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print"> rel="stylesheet"
<link rel="stylesheet" href="css/style.ca_CA.css" type="text/css" media="screen,print"> 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 type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-33766650-1']); _gaq.push(["_setAccount", "UA-33766650-1"]);
_gaq.push(['_trackPageview']); _gaq.push(["_trackPageview"]);
(function () { (function () {
var ga = document.createElement('script'); var ga = document.createElement("script");
ga.type = 'text/javascript'; ga.type = "text/javascript";
ga.async = true; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; ga.src =
var s = document.getElementsByTagName('script')[0]; ("https:" == document.location.protocol
? "https://ssl"
: "http://www") + ".google-analytics.com/ga.js";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(ga, s); s.parentNode.insertBefore(ga, s);
})(); })();
</script> </script>
</head> </head>
<body> <body>
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div> <div id="banner">
<header> <a href="https://github.com/danielkummer/git-flow-cheatsheet"
>Fork me on GitHub</a
>
</div>
<header>
<h1 id="title">git-flow cheatsheet</h1> <h1 id="title">git-flow cheatsheet</h1>
<p id="author"> <p id="author">
creat per <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> 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> <a
<script>!function (d, s, id) { href="https://twitter.com/share"
var js, fjs = d.getElementsByTagName(s)[0]; 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)) { if (!d.getElementById(id)) {
js = d.createElement(s); js = d.createElement(s);
js.id = id; js.id = id;
js.src = "//platform.twitter.com/widgets.js"; js.src = "//platform.twitter.com/widgets.js";
fjs.parentNode.insertBefore(js, fjs); fjs.parentNode.insertBefore(js, fjs);
} }
}(document, "script", "twitter-wjs");</script> })(document, "script", "twitter-wjs");
</script>
</p> </p>
<p id="desc">branques eficients usant git-flow, per <a href="http://nvie.com/">Vincent Driessen</a></p> <p id="desc">
<p id="translations">traduccions: 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.html" class="active" title="english">English</a> -
<a href="index.es_ES.html" title="spanish">Castellano</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.pt_BR.html" title="Brazilian Portugues"
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - >Brazilian Portugues</a
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - >
<a href="index.ja_JP.html" title="日本語">日本語</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.tr_TR.html" title="Turkce">Türkçe</a> -
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</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.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</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.de_DE.html" title="German">Deutsch (German)</a> -
<a href="#" title="Català">Català (Catalan)</a> - <a href="#" title="Català">Català (Catalan)</a> -
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</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.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
<a href="index.uk_UA.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.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
<a href="index.ar_MA.html" title="العربية">العربية</a> - -
<a href="index.vi_VN.html" title="Tiếng Việt"
>Tiếng Việt (Vietnamese)</a
>
- <a href="index.ar_MA.html" title="العربية">العربية</a> -
<a href="index.fa_FA.html" title="فارسی">فارسی</a> - <a href="index.fa_FA.html" title="فارسی">فارسی</a> -
<a href="index.pl_PL.html" title="Polish">Polski</a> - <a href="index.pl_PL.html" title="Polish">Polski</a> -
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a> <a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a> <a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
</p> </p>
</header> </header>
<div id="main"> <div id="main">
<div class="scrollblock">
<div class="scrollblock">
<h2>Sobre git-flow</h2> <h2>Sobre git-flow</h2>
<p> <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. git-flow és un conjunt d'extensions de git que proporcionen operacions
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">més</a></small> 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>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</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>
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">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Consells bàsics</h2> <h2>Consells bàsics</h2>
<ul> <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>
<li>El client per macOS/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 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 macOS/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> </li>
<li>Git-flow és una solució basada en merge. No fa rebase de branques de funcionalitat (feature branches).</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="setup" href="#setup">Instal·lació</a></h2> <h2><a name="setup" href="#setup">Instal·lació</a></h2>
<ul> <ul>
<li>Necessites una instal·lació de git funcionant com a prerrequisit.</li> <li>
Necessites una instal·lació de git funcionant com a prerrequisit.
</li>
<li>Git flow funciona a macOS, Linux i Windows</li> <li>Git flow funciona a macOS, Linux i Windows</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>macOS</h3> <h3>macOS</h3>
<span>Homebrew</span> <span>Homebrew</span>
<blockquote> <blockquote>$ brew install git-flow-avh</blockquote>
$ brew install git-flow-avh
</blockquote>
<span>Macports</span> <span>Macports</span>
<blockquote> <blockquote>$ port install git-flow-avh</blockquote>
$ port install git-flow-avh
</blockquote>
<h3>Linux</h3> <h3>Linux</h3>
<blockquote> <blockquote>$ apt-get install git-flow</blockquote>
$ apt-get install git-flow
</blockquote>
<h3>Windows (Cygwin)</h3> <h3>Windows (Cygwin)</h3>
<blockquote> <blockquote>
$ wget -q -O - --no-check-certificate $ wget -q -O - --no-check-certificate
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
install stable | bash
</blockquote> </blockquote>
<p>Necessites wget i util-linux per instal·lar git-flow.</p> <p>Necessites wget i util-linux per instal·lar git-flow.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <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>. 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> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow" />
</div>
</div> </div>
</div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">Començant</a></h2> <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>
Git flow necessita inicialitzar-se per personalitzar la configuració
del teu projecte.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Inicialitzar</h3> <h3>Inicialitzar</h3>
<p>Comença a usar git-flow inicialitzant-lo en un repositori git existent:</p>
<blockquote>
git flow init
</blockquote>
<p> <p>
Hauràs de contestar unes preguntes respecte les convencions per anomenar les branques.<br/> 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. Es recomana usar els valors per defecte.
</p> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="initialize"></div> <div class="initialize"></div>
@ -161,26 +230,36 @@
<div class="lines-open"></div> <div class="lines-open"></div>
<div class="lines-big"></div> <div class="lines-big"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock"> <h2>
<h2><a name="features" href="#features">Funcionalitats (features)</a></h2> <a name="features" href="#features">Funcionalitats (features)</a>
</h2>
<ul class="narrow"> <ul class="narrow">
<li>Desenvolupa noves funcionalitats per les properes entregues (releases)</li> <li>
<li>Normalment només existeixen en els repositoris dels desenvolupadors</li> Desenvolupa noves funcionalitats per les properes entregues
(releases)
</li>
<li>
Normalment només existeixen en els repositoris dels desenvolupadors
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Comença una nova funcionalitat</h3> <h3>Comença una nova funcionalitat</h3>
<p>El desenvolupament de noves funcionalitats comença des de la branca 'develop'.</p> <p>
El desenvolupament de noves funcionalitats comença des de la branca
'develop'.
</p>
<p>Comença a desenvolupar una nova funcionalitat amb</p> <p>Comença a desenvolupar una nova funcionalitat amb</p>
<blockquote> <blockquote>git flow feature start LAMEVAFUNCIONALITAT</blockquote>
git flow feature start LAMEVAFUNCIONALITAT <p>
</blockquote> Aquesta acció crea una nova branca de funcionalitat basada en
<p>Aquesta acció crea una nova branca de funcionalitat basada en 'develop' i la fa activa</p> 'develop' i la fa activa
</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -191,20 +270,19 @@
--> --></div>
</div>
<div class="col-2"> <div class="col-2">
<div class="feature-start"></div> <div class="feature-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Acaba una funcionalitat</h3> <h3>Acaba una funcionalitat</h3>
<p> <p>
Acaba el desenvolupament d'una funcionalitat. Acaba el desenvolupament d'una funcionalitat. Aquesta acció realitza
Aquesta acció realitza el següent: el següent:
</p> </p>
<ul> <ul>
<li>Integra LAMEVAFUNCIONALITAT a 'develop'</li> <li>Integra LAMEVAFUNCIONALITAT a 'develop'</li>
@ -212,196 +290,233 @@
<li>Torna a fer activa la branca 'develop'</li> <li>Torna a fer activa la branca 'develop'</li>
</ul> </ul>
<blockquote> <blockquote>git flow feature finish LAMEVAFUNCIONALITAT</blockquote>
git flow feature finish LAMEVAFUNCIONALITAT
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-end"></div> <div class="feature-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Publica una funcionalitat</h3> <h3>Publica una funcionalitat</h3>
<p> <p>
Estàs desenvolupant una funcionalitat en col·laboració amb altres desenvolupadors? <br/> Estàs desenvolupant una funcionalitat en col·laboració amb altres
Publica una funcionalitat al servidor remot de manera que hi puguin accedir altres usuaris. desenvolupadors? <br />
Publica una funcionalitat al servidor remot de manera que hi puguin
accedir altres usuaris.
</p> </p>
<blockquote> <blockquote>git flow feature publish LAMEVAFUNCIONALITAT</blockquote>
git flow feature publish LAMEVAFUNCIONALITAT
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-publish"></div> <div class="feature-publish"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Obtenint una funcionlitat publicada</h3> <h3>Obtenint una funcionlitat publicada</h3>
<p> <p>Obté una funcionalitat publicada per un altre usuari.</p>
Obté una funcionalitat publicada per un altre usuari.
</p>
<blockquote> <blockquote>
git flow feature pull origin LAMEVAFUNCIONALITAT git flow feature pull origin LAMEVAFUNCIONALITAT
</blockquote> </blockquote>
<p>Pots seguir una funcionalitat a l'origen usant <code> git flow feature track LAMEVAFUNCIONALITAT</code> </p> <p>
Pots seguir una funcionalitat a l'origen usant
<code> git flow feature track LAMEVAFUNCIONALITAT</code>
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="release" href="#release">Fes una entrega (release)</a></h2> <h2><a name="release" href="#release">Fes una entrega (release)</a></h2>
<ul> <ul>
<li>Prepara una nova entrega a producció</li> <li>Prepara una nova entrega a producció</li>
<li>Permet arreglar petits errors i preparar les meta-dades per l'entrega</li> <li>
Permet arreglar petits errors i preparar les meta-dades per
l'entrega
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Comença una entrega</h3> <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> <p>
<blockquote> Per començar una entrega, usa la comanda git flow release. Crea una
git flow release start ENTREGA [BASE] branca d'entrega des de la branca 'develop'.
</blockquote> </p>
<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> <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">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</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> <p>
<blockquote> És aconsellable publicar la branca d'entrega després de crear-la per
git flow release publish ENTREGA tal que altres desenvolupadors puguin començar a fer-hi commits. Tal
</blockquote> com per publicar funcionalitats, amb la comanda:
<p>Pots seguir una entrega en remot amb la comanda <br/><code>git flow release track ENTREGA</code></p> </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>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Acaba una entrega</h3> <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> <p>
Acabar una entrega és un dels grans passos en la gestió de branques
amb git. Realitza les següents accions:
</p>
<ul> <ul>
<li>Integra la branca d'entrega a 'master'</li> <li>Integra la branca d'entrega a 'master'</li>
<li>Etiqueta l'entrega amb el seu nom</li> <li>Etiqueta l'entrega amb el seu nom</li>
<li>Reintegra l'entrega a 'develop'</li> <li>Reintegra l'entrega a 'develop'</li>
<li>Esborra la branca d'entrega</li> <li>Esborra la branca d'entrega</li>
</ul> </ul>
<blockquote> <blockquote>git flow release finish ENTREGA</blockquote>
git flow release finish ENTREGA
</blockquote>
<p>No oblidis pujar les etiquetes amb <code>git push --tags</code></p> <p>No oblidis pujar les etiquetes amb <code>git push --tags</code></p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-end"></div> <div class="release-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">Errors a producció (hotfixes)</a></h2> <h2>
<a name="hotfixes" href="#hotfixes">Errors a producció (hotfixes)</a>
</h2>
<ul> <ul>
<li>A vegades cal actuar inmediatament davant un estat no desitjat de la versió de producció i fer un hotfix <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> </li>
<li>Es pot crear una branca des de l'etiqueta corresponent a la branca 'master' que marqui la versió a producció.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>git flow hotfix start</h3> <h3>git flow hotfix start</h3>
<p>Com les altres comandes de git flow, un hotfix s'inicia amb</p> <p>Com les altres comandes de git flow, un hotfix s'inicia amb</p>
<blockquote> <blockquote>git flow hotfix start VERSIÓ [NOMBASE]</blockquote>
git flow hotfix start VERSIÓ [NOMBASE] <p>
</blockquote> El paràmetre de la versió marca el nom de la nova entrega.
<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> Opcionalment pots especificar un nom base a partir del qual
començar.
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Acaba un hotfix</h3> <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> <p>
<blockquote> En acabar un hotfix, els canvis s'integren tant a 'develop' com a
git flow hotfix finish VERSIÓ 'master'. Addicionalment, la integració a 'master' s'etiqueta amb la
</blockquote> versió del hotfix.
</p>
<blockquote>git flow hotfix finish VERSIÓ</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-end"></div> <div class="hotfix-end"></div>
</div> </div>
</div> </div>
<div> <div>
<div class="col-1"></div> <div class="col-1"></div>
<div class="col-2"> <div class="col-2">
<div class="lines-close"></div> <div class="lines-close"></div>
<div class="lines-small-end"></div> <div class="lines-small-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="commands" href="#commands">Comandes</a></h2> <h2><a name="commands" href="#commands">Comandes</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands" />
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Tasques pendents</h2> <h2>Tasques pendents</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>No totes les comandes disponibles s'han explicat, només les més importants</li> <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 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> </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> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
</div> </div>
<footer>
<footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Comentaris</a></h2> <h2><a name="comments" href="#comments">Comentaris</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>
</footer> </footer>
<script type="text/javascript"> <script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */ /* * * DON'T EDIT BELOW THIS LINE * * */
(function () { (function () {
var dsq = document.createElement('script'); var dsq = document.createElement("script");
dsq.type = 'text/javascript'; dsq.type = "text/javascript";
dsq.async = true; dsq.async = true;
dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js'; dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); (
document.getElementsByTagName("head")[0] ||
document.getElementsByTagName("body")[0]
).appendChild(dsq);
})(); })();
</script> </script>
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a> <noscript
</noscript> >Please enable JavaScript to view the
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a> <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
</noscript>
<a href="http://disqus.com" class="dsq-brlink"
</body> >comments powered by <span class="logo-disqus">Disqus</span></a
>
</body>
</html> </html>

470
index.de_DE.html
View File

@ -1,159 +1,228 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns="http://www.w3.org/1999/html"> <html lang="en" xmlns="http://www.w3.org/1999/html">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>git-flow cheatsheet</title> <title>git-flow cheatsheet</title>
<link href='https://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'> <link
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print"> href="https://fonts.googleapis.com/css?family=Sansita+One"
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print"> 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 type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-33766650-1']); _gaq.push(["_setAccount", "UA-33766650-1"]);
_gaq.push(['_trackPageview']); _gaq.push(["_trackPageview"]);
(function () { (function () {
var ga = document.createElement('script'); var ga = document.createElement("script");
ga.type = 'text/javascript'; ga.type = "text/javascript";
ga.async = true; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; ga.src =
var s = document.getElementsByTagName('script')[0]; ("https:" == document.location.protocol
? "https://ssl"
: "http://www") + ".google-analytics.com/ga.js";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(ga, s); s.parentNode.insertBefore(ga, s);
})(); })();
</script> </script>
</head> </head>
<body> <body>
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div> <div id="banner">
<header> <a href="https://github.com/danielkummer/git-flow-cheatsheet"
>Fork me on GitHub</a
>
</div>
<header>
<h1 id="title">git-flow Spickzettel</h1> <h1 id="title">git-flow Spickzettel</h1>
<p id="author"> <p id="author">
erstellt von <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> erstellt von
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a> <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
<script>!function (d, s, id) { <a
var js, fjs = d.getElementsByTagName(s)[0]; 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)) { if (!d.getElementById(id)) {
js = d.createElement(s); js = d.createElement(s);
js.id = id; js.id = id;
js.src = "//platform.twitter.com/widgets.js"; js.src = "//platform.twitter.com/widgets.js";
fjs.parentNode.insertBefore(js, fjs); fjs.parentNode.insertBefore(js, fjs);
} }
}(document, "script", "twitter-wjs");</script> })(document, "script", "twitter-wjs");
</script>
</p> </p>
<p id="desc">Effizientes Branching mittels git-flow von <a href="http://nvie.com/">Vincent Driessen</a></p> <p id="desc">
<p id="translations">Übersetzungen: Effizientes Branching mittels git-flow von
<a href="index.html" title="English">English</a> - <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.es_ES.html" title="Spanish">Castellano</a> -
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> - <a href="index.pt_BR.html" title="Brazilian Portugues"
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - >Brazilian Portugues</a
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - >
<a href="index.ja_JP.html" title="日本語">日本語</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.tr_TR.html" title="Turkce">Türkçe</a> -
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</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.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> - <a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
<a href="#" class="active" title="German">Deutsch (German)</a> - <a href="#" class="active" title="German">Deutsch (German)</a> -
<a href="index.ca_CA.html" title="Català">Català (Catalan)</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.ro_RO.html" title="Romanian">Română (Romanian)</a> -
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> - <a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
<a href="index.uk_UA.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.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
<a href="index.pl_PL.html" title="Polish">Polski</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.ar_MA.html" title="العربية">العربية</a> - <a href="index.ar_MA.html" title="العربية">العربية</a> -
<a href="index.fa_FA.html" title="فارسی">فارسی</a> - <a href="index.fa_FA.html" title="فارسی">فارسی</a> -
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a> <a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a> <a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
</p> </p>
</header> </header>
<div id="main"> <div id="main">
<div class="scrollblock">
<div class="scrollblock">
<h2>Über</h2> <h2>Über</h2>
<p> <p>
git-flow ist ein Menge von Git-Erweiterungen, welche komplexe Repository-Arbeiten git-flow ist ein Menge von Git-Erweiterungen, welche komplexe
nach Vincent Driessens Branching-Modell ermöglicht. Repository-Arbeiten nach Vincent Driessens Branching-Modell
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">mehr</a></small> ermöglicht.
<small
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
>mehr</a
></small
>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>Dieser Spickzettel veranschaulicht die grundlegende Nutzung und den Ablauf von git-flow Operationen.</p> <p>
Dieser Spickzettel veranschaulicht die grundlegende Nutzung und den
Ablauf von git-flow Operationen.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Grundlegende Tipps</h2> <h2>Grundlegende Tipps</h2>
<ul> <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>
<li>Der macOS/Windows Client <a href="http://www.sourcetreeapp.com/">SourceTree</a> bietet ein exzellentes grafisches Interface und einfache Git-Flow Unterstützung.</li> git-flow bietet eine exzellente Hilfe und ausführliche Ausgabe auf
<li>git-flow ist eine rein Merge-basierte Lösung (Zusammenführung). Es findet kein Rebasing der Feature-Branches (Entwicklungszweige) statt.</li> der Kommandozeile. Lies Dir die Ausgaben aufmerksam durch und
versuche zu verstehen, was passiert.
</li>
<li>
Der macOS/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> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="setup" href="#setup">Einrichtung</a></h2> <h2><a name="setup" href="#setup">Einrichtung</a></h2>
<ul> <ul>
<li>Als Voraussetzung benötigst Du eine funktionierende Git Installation.</li> <li>
Als Voraussetzung benötigst Du eine funktionierende Git
Installation.
</li>
<li>git-flow läuft unter macOS, Linux und Windows.</li> <li>git-flow läuft unter macOS, Linux und Windows.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>macOS</h3> <h3>macOS</h3>
<span>Homebrew</span> <span>Homebrew</span>
<blockquote> <blockquote>$ brew install git-flow-avh</blockquote>
$ brew install git-flow-avh
</blockquote>
<span>Macports</span> <span>Macports</span>
<blockquote> <blockquote>$ port install git-flow-avh</blockquote>
$ port install git-flow-avh
</blockquote>
<h3>Linux</h3> <h3>Linux</h3>
<blockquote> <blockquote>$ apt-get install git-flow</blockquote>
$ apt-get install git-flow
</blockquote>
<h3>Windows (Cygwin)</h3> <h3>Windows (Cygwin)</h3>
<blockquote> <blockquote>
$ wget -q -O - --no-check-certificate $ wget -q -O - --no-check-certificate
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
install stable | bash
</blockquote> </blockquote>
<p>Du benötigst wget und util-linux, um git-flow zu installieren.</p> <p>Du benötigst wget und util-linux, um git-flow zu installieren.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <p>
Für eine detaillierte git-flow Installationsanleitung besuche bitte das <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow Für eine detaillierte git-flow Installationsanleitung besuche bitte
wiki</a>. das
<a
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
>git flow wiki</a
>.
</p> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow" />
</div>
</div> </div>
</div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">Erste Schritte</a></h2> <h2>
<p>git-flow muss initalisiert werden, um das Projektsetup anzupassen.</p> <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">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Initialisierung</h3> <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> <p>
Dabei musst Du einige Fragen bezüglich der Namenskoventionen Deiner Branches (Entwicklungszweige) beantworten.<br/> 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 bezüglich der Namenskoventionen Deiner
Branches (Entwicklungszweige) beantworten.<br />
Es wird empfohlen, die Standardwerte zu verwenden. Es wird empfohlen, die Standardwerte zu verwenden.
</p> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="initialize"></div> <div class="initialize"></div>
@ -161,10 +230,9 @@
<div class="lines-open"></div> <div class="lines-open"></div>
<div class="lines-big"></div> <div class="lines-big"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="features" href="#features">Features</a></h2> <h2><a name="features" href="#features">Features</a></h2>
<ul class="narrow"> <ul class="narrow">
@ -177,10 +245,11 @@
<h3>Entwicklung neuer Features</h3> <h3>Entwicklung neuer Features</h3>
<p>Neue Features werden vom 'develop'-Branch abgeleitet.</p> <p>Neue Features werden vom 'develop'-Branch abgeleitet.</p>
<p>Starte die Entwicklung eines neuen Features mittels</p> <p>Starte die Entwicklung eines neuen Features mittels</p>
<blockquote> <blockquote>git flow feature start MYFEATURE</blockquote>
git flow feature start MYFEATURE <p>
</blockquote> Dieser Befehl erstellt einen neuen Feature-Branch basierend auf
<p>Dieser Befehl erstellt einen neuen Feature-Branch basierend auf 'develop' und wechselt in diesen.</p> 'develop' und wechselt in diesen.
</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -191,253 +260,266 @@
--> --></div>
</div>
<div class="col-2"> <div class="col-2">
<div class="feature-start"></div> <div class="feature-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Fertigstellung eines Features</h3> <h3>Fertigstellung eines Features</h3>
<p> <p>
Beende die Entwicklung eines Features. Beende die Entwicklung eines Features. Dies führt zu folgenden
Dies führt zu folgenden Aktionen: Aktionen:
</p> </p>
<ul> <ul>
<li>Zusammenführen von MYFEATURE in den 'develop'-Branch (Merge-Prozess)</li> <li>
Zusammenführen von MYFEATURE in den 'develop'-Branch
(Merge-Prozess)
</li>
<li>Entfernt den Feature-Branch</li> <li>Entfernt den Feature-Branch</li>
<li>Wechselt zurück in den 'develop'-Branch</li> <li>Wechselt zurück in den 'develop'-Branch</li>
</ul> </ul>
<blockquote> <blockquote>git flow feature finish MYFEATURE</blockquote>
git flow feature finish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-end"></div> <div class="feature-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Veröffentlichen eines Features</h3> <h3>Veröffentlichen eines Features</h3>
<p> <p>
Entwickelst Du ein Feature in Zusammenarbeit? <br/> Entwickelst Du ein Feature in Zusammenarbeit? <br />
Veröffentliche Dein Feature auf einem entfernten Server, Veröffentliche Dein Feature auf einem entfernten Server, so dass es
so dass es auch von anderen verfolgt werden kann. auch von anderen verfolgt werden kann.
</p> </p>
<blockquote> <blockquote>git flow feature publish MYFEATURE</blockquote>
git flow feature publish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-publish"></div> <div class="feature-publish"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Holen eines veröffentlichten Features</h3> <h3>Holen eines veröffentlichten Features</h3>
<p> <p>
Hole ein Feature, welches von einem anderen Nutzer veröffentlicht wurde. Hole ein Feature, welches von einem anderen Nutzer veröffentlicht
wurde.
</p> </p>
<blockquote> <blockquote>git flow feature pull origin MYFEATURE</blockquote>
git flow feature pull origin MYFEATURE
</blockquote>
<p> <p>Du kannst ein Feature unter Verwendung von</p>
Du kannst ein Feature unter Verwendung von
</p>
<blockquote>git flow feature track MYFEATURE</blockquote> <blockquote>git flow feature track MYFEATURE</blockquote>
<p> <p>auf 'origin' verfolgen.</p>
auf 'origin' verfolgen.
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="release" href="#release">Erstelle ein Release</a></h2> <h2><a name="release" href="#release">Erstelle ein Release</a></h2>
<ul> <ul>
<li>Unterstützt die Fertigstellung einer Produktionsversion.</li> <li>Unterstützt die Fertigstellung einer Produktionsversion.</li>
<li>Erlaubt geringfügige Bugfixes und die Erstellung der Metadaten für ein Release</li> <li>
Erlaubt geringfügige Bugfixes und die Erstellung der Metadaten für
ein Release
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Beginne ein Release</h3> <h3>Beginne ein Release</h3>
<p> <p>
Um ein neues Release zu beginnen, benutze den git flow release Befehl. Um ein neues Release zu beginnen, benutze den git flow release
Mit diesem wird ein Release-Branch vom aktuellen 'develop'-Branch erstellt. Befehl. Mit diesem wird ein Release-Branch vom aktuellen
'develop'-Branch erstellt.
</p> </p>
<blockquote> <blockquote>git flow release start RELEASE [BASE]</blockquote>
git flow release start RELEASE [BASE]
</blockquote>
<p> <p>
Du kannst optional einen <code>[BASE]</code> Commit sha-1 Hash bereitstellen, Du kannst optional einen <code>[BASE]</code> Commit sha-1 Hash
um ein Release von diesem Commit zu starten. Der Commit muss sich im 'develop'-Branch befinden. bereitstellen, um ein Release von diesem Commit zu starten. Der
Commit muss sich im 'develop'-Branch befinden.
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p> <p>
Es ist ratsam, den Release-Branch nach der Erstellung zu veröffentlichen und damit anderen Entwicklern Es ist ratsam, den Release-Branch nach der Erstellung zu
die Möglichkeit für Commits zu geben. Mache es ähnlich wie bei einem Feature-Branch mit dem Befehl: 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> </p>
<blockquote> <blockquote>git flow release publish RELEASE</blockquote>
git flow release publish RELEASE
</blockquote>
<p> <p>
(Du kannst ein entferntes Remote-Release mittels <br/> (Du kannst ein entferntes Remote-Release mittels <br />
<code>git flow release track RELEASE</code> verfolgen.) <code>git flow release track RELEASE</code> verfolgen.)
</p> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Fertigstellung eines Releases</h3> <h3>Fertigstellung eines Releases</h3>
<p> <p>
Das Beenden eines Releases ist einer der größten Schritte im Git-Branching-Prozess. Das Beenden eines Releases ist einer der größten Schritte im
Es bewirkt folgende Aktionen: Git-Branching-Prozess. Es bewirkt folgende Aktionen:
</p> </p>
<ul> <ul>
<li>Zusammenführen des Release-Branches zurück in den 'master'-Branch. (Merge-Prozess)</li> <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>Markiert (Tagged) das Release mit seinem Namen</li>
<li>Zurückführen des Releases in den 'develop'-Branch (Merge-Prozess)</li> <li>
Zurückführen des Releases in den 'develop'-Branch (Merge-Prozess)
</li>
<li>Entfernt den Release-Branch</li> <li>Entfernt den Release-Branch</li>
</ul> </ul>
<blockquote> <blockquote>git flow release finish RELEASE</blockquote>
git flow release finish RELEASE <p>
</blockquote> Vergesse nicht Deine Tags mittels <code>git push --tags</code> zu
<p>Vergesse nicht Deine Tags mittels <code>git push --tags</code> zu pushen.</p> pushen.
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-end"></div> <div class="release-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2> <h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
<ul> <ul>
<li> <li>
Hotfixes sind notwendig, sobald ein unerwünschter Zustand innerhalb einer Live-Produktionsversion Hotfixes sind notwendig, sobald ein unerwünschter Zustand innerhalb
eintritt und resultierend daraus sofort gehandelt werden muss. einer Live-Produktionsversion eintritt und resultierend daraus
sofort gehandelt werden muss.
</li> </li>
<li> <li>
Ein Hotfix kann aus dem entsprechenden Tag des 'master'-Branches, welcher die Produktionsversion markiert, Ein Hotfix kann aus dem entsprechenden Tag des 'master'-Branches,
direkt abgezweigt werden. welcher die Produktionsversion markiert, direkt abgezweigt werden.
</li> </li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>git flow hotfix start</h3> <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> <p>
begonnen. Das VERSION-Argument markiert hierbei den neuen Hotfix-Release-Namen. Ähnlich wie auch die anderen git-flow Befehle wird ein Hotfix
Optional kannst Du auch einen BASENAME spezifizieren. 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> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Fertigstellung eines Hotfixes</h3> <h3>Fertigstellung eines Hotfixes</h3>
<p> <p>
Mit dem Beenden eines Hotfixes wird dieser in den 'develop'- und 'master'-Branch Mit dem Beenden eines Hotfixes wird dieser in den 'develop'- und
zusammengeführt (Merge). Nebenbei wird der 'master'-Branch mit einem Tag, 'master'-Branch zusammengeführt (Merge). Nebenbei wird der
welcher die Hotfix-Version beinhaltet, markiert. 'master'-Branch mit einem Tag, welcher die Hotfix-Version
beinhaltet, markiert.
</p> </p>
<blockquote> <blockquote>git flow hotfix finish VERSION</blockquote>
git flow hotfix finish VERSION
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-end"></div> <div class="hotfix-end"></div>
</div> </div>
</div> </div>
<div> <div>
<div class="col-1"></div> <div class="col-1"></div>
<div class="col-2"> <div class="col-2">
<div class="lines-close"></div> <div class="lines-close"></div>
<div class="lines-small-end"></div> <div class="lines-small-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="commands" href="#commands">Befehle</a></h2> <h2><a name="commands" href="#commands">Befehle</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands" />
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Backlog</h2> <h2>Backlog</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Nur die wichtigsten aller verfügbaren Befehle sind hier behandelt.</li> <li>
<li>Du kannst weiterhin alle Git-Befehle normal nutzen, wie Du es gewohnt bist. Git-flow ist nur eine Werkzeugsammlung.</li> Nur die wichtigsten aller verfügbaren Befehle sind hier behandelt.
<li>Das 'support' Feature ist noch in der Beta-Phase und die Nutzung nicht empfohlen.</li> </li>
<li>Wenn Du Übersetzungen beisteuern möchtest, würde ich mich freuen, diese zu integrieren.</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 in der Beta-Phase und die Nutzung
nicht empfohlen.
</li>
<li>
Wenn Du Übersetzungen beisteuern möchtest, würde ich mich freuen,
diese zu integrieren.
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
</div> </div>
<footer>
<footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Kommentare</a></h2> <h2><a name="comments" href="#comments">Kommentare</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>
</footer> </footer>
<script type="text/javascript"> <script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */ /* * * DON'T EDIT BELOW THIS LINE * * */
(function () { (function () {
var dsq = document.createElement('script'); var dsq = document.createElement("script");
dsq.type = 'text/javascript'; dsq.type = "text/javascript";
dsq.async = true; dsq.async = true;
dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js'; dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); (
document.getElementsByTagName("head")[0] ||
document.getElementsByTagName("body")[0]
).appendChild(dsq);
})(); })();
</script> </script>
<noscript>Bitte aktiviere Javascript um die Kommentare zu sehen. <a href="http://disqus.com/?ref_noscript">Powered by Disqus.</a> <noscript
</noscript> >Bitte aktiviere Javascript um die Kommentare zu sehen.
<a href="http://disqus.com" class="dsq-brlink">Kommentare powered by <span class="logo-disqus">Disqus</span></a> <a href="http://disqus.com/?ref_noscript">Powered by Disqus.</a>
</noscript>
<a href="http://disqus.com" class="dsq-brlink"
</body> >Kommentare powered by <span class="logo-disqus">Disqus</span></a
>
</body>
</html> </html>

448
index.el_GR.html
View File

@ -1,96 +1,146 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns="http://www.w3.org/1999/html"> <html lang="en" xmlns="http://www.w3.org/1999/html">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>git-flow Φύλλο αναφοράς</title> <title>git-flow Φύλλο αναφοράς</title>
<link href='https://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'> <link
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print"> href="https://fonts.googleapis.com/css?family=Sansita+One"
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print"> 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 type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push ( [ '_setAccount', 'UA-33766650-1' ] ); _gaq.push(["_setAccount", "UA-33766650-1"]);
_gaq.push ( [ '_trackPageview' ] ); _gaq.push(["_trackPageview"]);
_gaq.push ( [ 'gr._setAccount', 'UA-63807502-1' ] ); _gaq.push(["gr._setAccount", "UA-63807502-1"]);
_gaq.push ( [ 'gr._trackPageview' ] ); _gaq.push(["gr._trackPageview"]);
(function () { (function () {
var ga = document.createElement ( 'script' ); var ga = document.createElement("script");
ga.type = 'text/javascript'; ga.type = "text/javascript";
ga.async = true; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; ga.src =
var s = document.getElementsByTagName ( 'script' )[ 0 ]; ("https:" == document.location.protocol
s.parentNode.insertBefore ( ga, s ); ? "https://ssl"
}) (); : "http://www") + ".google-analytics.com/ga.js";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(ga, s);
})();
</script> </script>
</head> </head>
<body> <body>
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Διακλάδωσέ με στο GitHub</a></div> <div id="banner">
<header> <a href="https://github.com/danielkummer/git-flow-cheatsheet"
>Διακλάδωσέ με στο GitHub</a
>
</div>
<header>
<h1 id="title">git-flow Φύλλο αναφοράς</h1> <h1 id="title">git-flow Φύλλο αναφοράς</h1>
<p id="author"> <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> <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
<script>!function ( d, s, id ) { <a
var js, fjs = d.getElementsByTagName ( s )[ 0 ]; href="https://twitter.com/share"
if ( !d.getElementById ( id ) ) { class="twitter-share-button"
js = d.createElement ( s ); 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.id = id;
js.src = "//platform.twitter.com/widgets.js"; js.src = "//platform.twitter.com/widgets.js";
fjs.parentNode.insertBefore ( js, fjs ); fjs.parentNode.insertBefore(js, fjs);
} }
} ( document, "script", "twitter-wjs" );</script> })(document, "script", "twitter-wjs");
</script>
</p>
<p id="desc">
αποτελεσματικές διακλαδώσεις χρησιμοποιώντας το git-flow του
<a href="http://nvie.com/">Vincent Driessen</a>
</p> </p>
<p id="desc">αποτελεσματικές διακλαδώσεις χρησιμοποιώντας το git-flow του <a href="http://nvie.com/">Vincent
Driessen</a></p>
<p id="translations">translations: <p id="translations">
<a href="#" title="english">English</a> - translations: <a href="#" title="english">English</a> -
<a href="index.es_ES.html" title="spanish">Castellano</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.pt_BR.html" title="Brazilian Portugues"
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - >Brazilian Portugues</a
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - >
<a href="index.ja_JP.html" title="日本語">日本語</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.tr_TR.html" title="Turkce">Türkçe</a> -
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</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.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</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.de_DE.html" title="German">Deutsch (German)</a> -
<a href="index.ca_CA.html" title="Català">Català (Catalan)</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.ro_RO.html" title="Romanian">Română (Romanian)</a> -
<a href="index.el_GR.html" class="active" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> - <a href="index.el_GR.html" class="active" title="Ελληνικά (Greek)"
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a> - >Ελληνικά (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.uk_UA.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.ar_MA.html" title="العربية">العربية</a> - <a href="index.ar_MA.html" title="العربية">العربية</a> -
<a href="index.fa_FA.html" title="فارسی">فارسی</a> - <a href="index.fa_FA.html" title="فارسی">فارسی</a> -
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a> <a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a> <a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
</p> </p>
</header> </header>
<div id="main">
<div id="main">
<div class="scrollblock"> <div class="scrollblock">
<h2>Σχετικά</h2> <h2>Σχετικά</h2>
<p> <p>
Το git-flow είναι ένα σύνολο από επεκτάσεις για το git που παρέχουν υψηλού επιπέδου λειτουργίες σε εν- Το git-flow είναι ένα σύνολο από επεκτάσεις για το git που παρέχουν
αποθετήρια για το μοντέλο διακλαδώσεων του Vincent υψηλού επιπέδου λειτουργίες σε εν- αποθετήρια για το μοντέλο
Driessen. διακλαδώσεων του Vincent Driessen.
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">περισσότερα</a></small> <small
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
>περισσότερα</a
></small
>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>Αυτό το φύλλο αναφοράς, παρουσιάζει την βασική χρήση και τα αποτελέσματα των λειτουργιών του git-flow</p> <p>
Αυτό το φύλλο αναφοράς, παρουσιάζει την βασική χρήση και τα
αποτελέσματα των λειτουργιών του git-flow
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
@ -98,24 +148,31 @@
<div class="scrollblock"> <div class="scrollblock">
<h2>Βασικές συμβουλές</h2> <h2>Βασικές συμβουλές</h2>
<ul> <ul>
<li>Το Git flow παρέχει εξαιρετική βοήθεια στην γραμμή εντολών και στην έξοδο. Διαβάστε προσεκτικά για να <li>
δείτε τι συμβαίνει... Το Git flow παρέχει εξαιρετική βοήθεια στην γραμμή εντολών και στην
έξοδο. Διαβάστε προσεκτικά για να δείτε τι συμβαίνει...
</li> </li>
<li>Το τερματικό <a href="http://www.sourcetreeapp.com/">Sourcetree</a> για macOS/Windows είναι ένα εξαιρετικό <li>
γραφικό περιβάλλων εργασίας για git και παρέχει υποστήριξη για το git-flow Το τερματικό
<a href="http://www.sourcetreeapp.com/">Sourcetree</a> για
macOS/Windows είναι ένα εξαιρετικό γραφικό περιβάλλων εργασίας για
git και παρέχει υποστήριξη για το git-flow
</li> </li>
<li>Το Git-flow είναι μια λύση βασισμένη στη συγχώνευση (merge). Δεν αναπροσαρμόζει διακλαδώσεις <li>
χαρακτηριστικών. Το Git-flow είναι μια λύση βασισμένη στη συγχώνευση (merge). Δεν
αναπροσαρμόζει διακλαδώσεις χαρακτηριστικών.
</li> </li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="setup" href="#setup">Εγκατάσταση</a></h2> <h2><a name="setup" href="#setup">Εγκατάσταση</a></h2>
<ul> <ul>
<li>Είναι προϋπόθεση να έχετε ήδη εγκατεστημένο το git στον υπολογιστή σας.</li> <li>
Είναι προϋπόθεση να έχετε ήδη εγκατεστημένο το git στον υπολογιστή
σας.
</li>
<li>Το Git flow λειτουργεί σε macOS, Linux και Windows</li> <li>Το Git flow λειτουργεί σε macOS, Linux και Windows</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
@ -123,52 +180,60 @@
<div class="col-1"> <div class="col-1">
<h3>macOS</h3> <h3>macOS</h3>
<span>Homebrew</span> <span>Homebrew</span>
<blockquote> <blockquote>$ brew install git-flow-avh</blockquote>
$ brew install git-flow-avh
</blockquote>
<span>Macports</span> <span>Macports</span>
<blockquote> <blockquote>$ port install git-flow-avh</blockquote>
$ port install git-flow-avh
</blockquote>
<h3>Linux</h3> <h3>Linux</h3>
<blockquote> <blockquote>$ apt-get install git-flow</blockquote>
$ apt-get install git-flow
</blockquote>
<h3>Windows (Cygwin)</h3> <h3>Windows (Cygwin)</h3>
<blockquote> <blockquote>
$ wget -q -O - --no-check-certificate $ wget -q -O - --no-check-certificate
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
install stable | bash
</blockquote> </blockquote>
<p>Χρειάζεστε το wget και το util-linux για να εγκαταστήσετε το git-flow.</p> <p>
Χρειάζεστε το wget και το util-linux για να εγκαταστήσετε το
git-flow.
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <p>
Για αναλυτικές οδηγίες εγκατάστασης του git flow παρακαλώ επισκεφτείτε το Για αναλυτικές οδηγίες εγκατάστασης του git flow παρακαλώ
<a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow wiki</a>. επισκεφτείτε το
<a
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
>git flow wiki</a
>.
</p> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow" />
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">Αρχίζοντας</a></h2> <h2>
<a name="getting_started" href="#getting_started">Αρχίζοντας</a>
</h2>
<p>Το Git flow πρέπει να προετοιμαστεί, ώστε να προσαρμόσετε τις ρυθμίσεις του έργου σας.</p> <p>
Το Git flow πρέπει να προετοιμαστεί, ώστε να προσαρμόσετε τις
ρυθμίσεις του έργου σας.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Προετοιμασία</h3> <h3>Προετοιμασία</h3>
<p>Αρχίστε να χρησιμοποιείτε το git-flow προετοιμάζοντας το, μέσα σε ένα git εν-αποθετήριο (git repository):</p>
<blockquote>
git flow init
</blockquote>
<p> <p>
Θα πρέπει να απαντήσετε μερικές ερωτήσεις σχετικά με τους κανόνες ονοματοδοσίας για τις διακλαδώσεις.<br/> Αρχίστε να χρησιμοποιείτε το git-flow προετοιμάζοντας το, μέσα σε
ένα git εν-αποθετήριο (git repository):
</p>
<blockquote>git flow init</blockquote>
<p>
Θα πρέπει να απαντήσετε μερικές ερωτήσεις σχετικά με τους κανόνες
ονοματοδοσίας για τις διακλαδώσεις.<br />
Συνιστάται η χρήση των τιμών που προτείνονται. Συνιστάται η χρήση των τιμών που προτείνονται.
</p> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="initialize"></div> <div class="initialize"></div>
@ -178,7 +243,6 @@
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="features" href="#features">Χαρακτηριστικά</a></h2> <h2><a name="features" href="#features">Χαρακτηριστικά</a></h2>
@ -191,13 +255,18 @@
<div class="col-1"> <div class="col-1">
<h3>Αρχίστε ένα νέο χαρακτηριστικό</h3> <h3>Αρχίστε ένα νέο χαρακτηριστικό</h3>
<p>Η δημιουργία ενός νέου χαρακτηριστικού αρχίζει (δημιουργείται) από την διακλάδωση 'develop'</p> <p>
Η δημιουργία ενός νέου χαρακτηριστικού αρχίζει (δημιουργείται) από
την διακλάδωση 'develop'
</p>
<p>Αρχίστε την δημιουργία νέου χαρακτηριστικού με την εντολή</p> <p>Αρχίστε την δημιουργία νέου χαρακτηριστικού με την εντολή</p>
<blockquote> <blockquote>git flow feature start MYFEATURE</blockquote>
git flow feature start MYFEATURE <p>
</blockquote> Αυτή η ενέργεια δημιουργεί μια νέα διακλάδωση για νέο χαρακτηριστικό
<p>Αυτή η ενέργεια δημιουργεί μια νέα διακλάδωση για νέο χαρακτηριστικό βασισμένη στην διακλάδωση 'develop' και μεταπήδηση στην νέα διακλάδωση</p> βασισμένη στην διακλάδωση 'develop' και μεταπήδηση στην νέα
διακλάδωση
</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -219,18 +288,16 @@
<div class="col-1"> <div class="col-1">
<h3>Ολοκληρώστε την δημιουργία ενός νέου χαρακτηριστικού.</h3> <h3>Ολοκληρώστε την δημιουργία ενός νέου χαρακτηριστικού.</h3>
<p> <p>Αυτή η ενέργεια κάνει τα ακόλουθα</p>
Αυτή η ενέργεια κάνει τα ακόλουθα
</p>
<ul> <ul>
<li>Συγχωνεύει το MYFEATURE στο 'develop'</li> <li>Συγχωνεύει το MYFEATURE στο 'develop'</li>
<li>Αφαιρεί την διακλάδωση που δημιουργήθηκε για το νέο χαρακτηριστικό</li> <li>
Αφαιρεί την διακλάδωση που δημιουργήθηκε για το νέο χαρακτηριστικό
</li>
<li>Μεταπηδά ξανά στην διακλάδωση 'develop'</li> <li>Μεταπηδά ξανά στην διακλάδωση 'develop'</li>
</ul> </ul>
<blockquote> <blockquote>git flow feature finish MYFEATURE</blockquote>
git flow feature finish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-end"></div> <div class="feature-end"></div>
@ -242,13 +309,13 @@
<h3>Δημοσιεύστε ένα χαρακτηριστικό</h3> <h3>Δημοσιεύστε ένα χαρακτηριστικό</h3>
<p> <p>
Αναπτύσσετε ένα χαρακτηριστικό της εφαρμογής σας σε συνεργασία με άλλους προγραμματιστές;<br/> Αναπτύσσετε ένα χαρακτηριστικό της εφαρμογής σας σε συνεργασία με
Δημοσιεύστε το χαρακτηριστικό σας στον απομακρυσμένο server, ώστε να μπορούν οι άλλοι προγραμματιστές να το χρησιμοποιήσουν. άλλους προγραμματιστές;<br />
Δημοσιεύστε το χαρακτηριστικό σας στον απομακρυσμένο server, ώστε να
μπορούν οι άλλοι προγραμματιστές να το χρησιμοποιήσουν.
</p> </p>
<blockquote> <blockquote>git flow feature publish MYFEATURE</blockquote>
git flow feature publish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-publish"></div> <div class="feature-publish"></div>
@ -260,49 +327,67 @@
<h3>Πάρτε ένα δημοσιευμένο χαρακτηριστικό</h3> <h3>Πάρτε ένα δημοσιευμένο χαρακτηριστικό</h3>
<p> <p>
Πάρτε ένα δημοσιευμένο χαρακτηριστικό από τον απομακρυσμένο server που το δημοσίευσε κάποιος άλλος προγραμματιστής. Πάρτε ένα δημοσιευμένο χαρακτηριστικό από τον απομακρυσμένο server
που το δημοσίευσε κάποιος άλλος προγραμματιστής.
</p> </p>
<blockquote> <blockquote>git flow feature pull origin MYFEATURE</blockquote>
git flow feature pull origin MYFEATURE
</blockquote>
<p>Μπορείτε να παρακολουθείτε ένα χαρακτηριστικό στον απομακρυσμένο server (origin) χρησιμοποιώντας την εντολή<code> git flow feature track MYFEATURE</code></p> <p>
Μπορείτε να παρακολουθείτε ένα χαρακτηριστικό στον απομακρυσμένο
server (origin) χρησιμοποιώντας την εντολή<code>
git flow feature track MYFEATURE</code
>
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="release" href="#release">Δημιουργήστε μια νέα έκδοση</a></h2> <h2>
<a name="release" href="#release">Δημιουργήστε μια νέα έκδοση</a>
</h2>
<ul> <ul>
<li>Υποστηρίζει την προετοιμασία μια έκδοσης για παραγωγή</li> <li>Υποστηρίζει την προετοιμασία μια έκδοσης για παραγωγή</li>
<li>Επιτρέπει μικρής σημασίας επιδιορθώσεις σφαλμάτων και προετοιμάζει τα μέτα-δεδομένα για την έκδοση</li> <li>
Επιτρέπει μικρής σημασίας επιδιορθώσεις σφαλμάτων και προετοιμάζει
τα μέτα-δεδομένα για την έκδοση
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Αρχίστε μια έκδοση</h3> <h3>Αρχίστε μια έκδοση</h3>
<p>Για να αρχίσετε μια νέα έκδοση, χρησιμοποιήστε την εντολή του git flow, release. Η εντολή αυτή δημιουργεί μια νέα διακλάδωση, από την διακλάδωση 'develop'</p> <p>
Για να αρχίσετε μια νέα έκδοση, χρησιμοποιήστε την εντολή του git
flow, release. Η εντολή αυτή δημιουργεί μια νέα διακλάδωση, από την
διακλάδωση 'develop'
</p>
<blockquote> <blockquote>git flow release start RELEASE [BASE]</blockquote>
git flow release start RELEASE [BASE] <p>
</blockquote> Μπορείτε προαιρετικά να εισάγετε ως <code>[BASE]</code> το sha-1
<p>Μπορείτε προαιρετικά να εισάγετε ως <code>[BASE]</code> το sha-1 hash ενός commit για να αρχίσετε την νέα έκδοση το συγκεκριμένο commit. Το commit hash ενός commit για να αρχίσετε την νέα έκδοση το συγκεκριμένο
πρέπει να είναι στην διακλάδωση 'develop'.</p> commit. Το commit πρέπει να είναι στην διακλάδωση 'develop'.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>Είναι καλό να δημοσιεύσετε την διακλάδωση έκδοσης, μετά την δημιουργία της, ώστε να επιτρέψετε commits έκδοσης από άλλους προγραμματιστές. <p>
Μπορείτε να το κάνετε αυτό, με τον ίδιο τρόπο που δημοσιεύεται τα νέα χαρακτηριστικά, με την εντολή:</p> Είναι καλό να δημοσιεύσετε την διακλάδωση έκδοσης, μετά την
<blockquote> δημιουργία της, ώστε να επιτρέψετε commits έκδοσης από άλλους
git flow release publish RELEASE προγραμματιστές. Μπορείτε να το κάνετε αυτό, με τον ίδιο τρόπο που
</blockquote> δημοσιεύεται τα νέα χαρακτηριστικά, με την εντολή:
<p>(Μπορείτε να παρακολουθείτε απομακρυσμένες εκδόσεις με την εντολή <br/><code>git flow release track RELEASE</code>)</p> </p>
<blockquote>git flow release publish RELEASE</blockquote>
<p>
(Μπορείτε να παρακολουθείτε απομακρυσμένες εκδόσεις με την εντολή
<br /><code>git flow release track RELEASE</code>)
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
@ -313,34 +398,46 @@
<div class="col-1"> <div class="col-1">
<h3>Ολοκληρώνοντας μια νέα έκδοση</h3> <h3>Ολοκληρώνοντας μια νέα έκδοση</h3>
<p>Η ολοκλήρωση μιας νέας έκδοσης είναι ένα από τα μεγάλα βήματα στις διακλαδώσεις του git γιατί γίνονται πολλές ενέργειες μαζί:</p> <p>
Η ολοκλήρωση μιας νέας έκδοσης είναι ένα από τα μεγάλα βήματα στις
διακλαδώσεις του git γιατί γίνονται πολλές ενέργειες μαζί:
</p>
<ul> <ul>
<li>Συγχωνεύει την διακλάδωση της έκδοσης με την διακλάδωση 'master'</li> <li>
Συγχωνεύει την διακλάδωση της έκδοσης με την διακλάδωση 'master'
</li>
<li>Βάζει την ετικέτα στην έκδοση με το όνομα της</li> <li>Βάζει την ετικέτα στην έκδοση με το όνομα της</li>
<li>Συγχωνεύει την έκδοση με την διακλάδωση 'develop'</li> <li>Συγχωνεύει την έκδοση με την διακλάδωση 'develop'</li>
<li>Διαγράψει την διακλάδωση της έκδοσης</li> <li>Διαγράψει την διακλάδωση της έκδοσης</li>
</ul> </ul>
<blockquote> <blockquote>git flow release finish RELEASE</blockquote>
git flow release finish RELEASE <p>
</blockquote> Μην ξεχάσετε να σπρώξετε τις ετικέτες σας με την εντολή
<p>Μην ξεχάσετε να σπρώξετε τις ετικέτες σας με την εντολή <code>git push --tags</code></p> <code>git push --tags</code>
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-end"></div> <div class="release-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">Άμεσες επιδιορθώσεις (Hotfixes)</a></h2> <h2>
<a name="hotfixes" href="#hotfixes"
>Άμεσες επιδιορθώσεις (Hotfixes)</a
>
</h2>
<ul> <ul>
<li> <li>
Οι άμεσες επιδιορθώσεις προκύπτουν από την ανάγκη της άμεσης επέμβασης σε μια ανεπιθύμητη κατάσταση της τρέχουσας έκδοσης στο λογισμικό παραγωγής. Οι άμεσες επιδιορθώσεις προκύπτουν από την ανάγκη της άμεσης
επέμβασης σε μια ανεπιθύμητη κατάσταση της τρέχουσας έκδοσης στο
λογισμικό παραγωγής.
</li> </li>
<li> <li>
Μπορεί η νέα διακλάδωση να δημιουργηθεί από την αντίστοιχη ετικέτα στην κεντρική (master) διακλάδωση που χαρακτηρίζει την έκδοση παραγωγής. Μπορεί η νέα διακλάδωση να δημιουργηθεί από την αντίστοιχη ετικέτα
στην κεντρική (master) διακλάδωση που χαρακτηρίζει την έκδοση
παραγωγής.
</li> </li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
@ -348,11 +445,16 @@
<div class="col-1"> <div class="col-1">
<h3>git flow hotfix start</h3> <h3>git flow hotfix start</h3>
<p>Όπως και οι άλλες εντολές του git flow, μία άμεση επιδιόρθωση αρχίζει με</p> <p>
<blockquote> Όπως και οι άλλες εντολές του git flow, μία άμεση επιδιόρθωση
git flow hotfix start VERSION [BASENAME] αρχίζει με
</blockquote> </p>
<p>Η επιλογή VERSION, χαρακτηρίζει το όνομα της νέας άμεσης επιδιόρθωσης. Προαιρετικά μπορείτε να ορίσετε ένα όνομα βάσης για να αρχίσετε από εκεί.</p> <blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
<p>
Η επιλογή VERSION, χαρακτηρίζει το όνομα της νέας άμεσης
επιδιόρθωσης. Προαιρετικά μπορείτε να ορίσετε ένα όνομα βάσης για να
αρχίσετε από εκεί.
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
@ -364,12 +466,12 @@
<h3>Ολοκληρώνοντας μία άμεση επιδιόρθωση</h3> <h3>Ολοκληρώνοντας μία άμεση επιδιόρθωση</h3>
<p> <p>
Με την ολοκλήρωση μιας άμεσης επιδιόρθωσης, η διακλάδωση συγχωνεύεται με την διακλάδωση develop και master. Με την ολοκλήρωση μιας άμεσης επιδιόρθωσης, η διακλάδωση
Επιπλέον η κεντρική διακλάδωση (master) αποκτά την ετικέτα του ονόματος της άμεσης επιδιόρθωσης. συγχωνεύεται με την διακλάδωση develop και master. Επιπλέον η
κεντρική διακλάδωση (master) αποκτά την ετικέτα του ονόματος της
άμεσης επιδιόρθωσης.
</p> </p>
<blockquote> <blockquote>git flow hotfix finish VERSION</blockquote>
git flow hotfix finish VERSION
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-end"></div> <div class="hotfix-end"></div>
@ -384,10 +486,9 @@
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="commands" href="#commands">Εντολές</a></h2> <h2><a name="commands" href="#commands">Εντολές</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands" />
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
@ -395,39 +496,60 @@
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Εδώ δεν καλύπτονται όλες οι διαθέσιμες εντολές, αλλά μόνο οι πιο σημαντικές</li> <li>
<li>Μπορείτε να συνεχίσετε την χρήση του git και όλες τις εντολές του κανονικά όπως τις γνωρίζετε, το git flow είναι απλά μια συλλογή με εργαλεία.</li> Εδώ δεν καλύπτονται όλες οι διαθέσιμες εντολές, αλλά μόνο οι πιο
<li>Το χαρακτηριστικό 'support' είναι ακόμα σε κατάσταση beta, δεν σας συμβουλεύουμε να το χρησιμοποιήσετε</li> σημαντικές
<li>Αν σας αρέσει να παρέχετε μεταφράσεις, θα είναι χαρά μου να τις ενσωματώσω</li> </li>
<li>
Μπορείτε να συνεχίσετε την χρήση του git και όλες τις εντολές του
κανονικά όπως τις γνωρίζετε, το git flow είναι απλά μια συλλογή με
εργαλεία.
</li>
<li>
Το χαρακτηριστικό 'support' είναι ακόμα σε κατάσταση beta, δεν σας
συμβουλεύουμε να το χρησιμοποιήσετε
</li>
<li>
Αν σας αρέσει να παρέχετε μεταφράσεις, θα είναι χαρά μου να τις
ενσωματώσω
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
</div> </div>
<footer>
<footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Σχόλια</a></h2> <h2><a name="comments" href="#comments">Σχόλια</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>
</footer> </footer>
<script type="text/javascript"> <script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */ /* * * DON'T EDIT BELOW THIS LINE * * */
(function () { (function () {
var dsq = document.createElement ( 'script' ); var dsq = document.createElement("script");
dsq.type = 'text/javascript'; dsq.type = "text/javascript";
dsq.async = true; dsq.async = true;
dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js'; dsq.src = "http://" + disqus_shortname + ".disqus.com/embed.js";
(document.getElementsByTagName ( 'head' )[ 0 ] || document.getElementsByTagName ( 'body' )[ 0 ]).appendChild ( dsq ); (
}) (); document.getElementsByTagName("head")[0] ||
</script> document.getElementsByTagName("body")[0]
<noscript>Παρακαλώ ενεργοποιείστε την JavaScript για να δείτε τα <a href="http://disqus.com/?ref_noscript">σχόλια που υποστηρίζονται από το Disqus.</a> ).appendChild(dsq);
</noscript> })();
<a href="http://disqus.com" class="dsq-brlink">τα σχόλια παρέχονται από το <span class="logo-disqus">Disqus</span></a> </script>
</body> <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> </html>

461
index.es_ES.html
View File

@ -1,108 +1,165 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns="http://www.w3.org/1999/html"> <html lang="en" xmlns="http://www.w3.org/1999/html">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>git-flow cheatsheet</title> <title>git-flow cheatsheet</title>
<link href='https://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'> <link
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print"> href="https://fonts.googleapis.com/css?family=Sansita+One"
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print"> 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 type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-33766650-1']); _gaq.push(["_setAccount", "UA-33766650-1"]);
_gaq.push(['_trackPageview']); _gaq.push(["_trackPageview"]);
(function () { (function () {
var ga = document.createElement('script'); var ga = document.createElement("script");
ga.type = 'text/javascript'; ga.type = "text/javascript";
ga.async = true; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; ga.src =
var s = document.getElementsByTagName('script')[0]; ("https:" == document.location.protocol
? "https://ssl"
: "http://www") + ".google-analytics.com/ga.js";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(ga, s); s.parentNode.insertBefore(ga, s);
})(); })();
</script> </script>
</head> </head>
<body> <body>
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div> <div id="banner">
<header> <a href="https://github.com/danielkummer/git-flow-cheatsheet"
>Fork me on GitHub</a
>
</div>
<header>
<h1 id="title">git-flow cheatsheet</h1> <h1 id="title">git-flow cheatsheet</h1>
<p id="author"> <p id="author">
creado por <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> 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> <a
<script>!function (d, s, id) { href="https://twitter.com/share"
var js, fjs = d.getElementsByTagName(s)[0]; 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)) { if (!d.getElementById(id)) {
js = d.createElement(s); js = d.createElement(s);
js.id = id; js.id = id;
js.src = "//platform.twitter.com/widgets.js"; js.src = "//platform.twitter.com/widgets.js";
fjs.parentNode.insertBefore(js, fjs); fjs.parentNode.insertBefore(js, fjs);
} }
}(document, "script", "twitter-wjs");</script> })(document, "script", "twitter-wjs");
</script>
</p> </p>
<p id="desc">ramificaciones eficientes usando git-flow, por <a href="http://nvie.com/">Vincent Driessen</a></p> <p id="desc">
<p id="translations">traducciones: ramificaciones eficientes usando git-flow, por
<a href="index.html" title="english">English</a> - <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="#" class="active" title="spanish">Castellano</a> -
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> - <a href="index.pt_BR.html" title="Brazilian Portugues"
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - >Brazilian Portugues</a
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - >
<a href="index.ja_JP.html" title="日本語">日本語</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.ko_KR.html" title="한국어">한국어(Korean)</a> -
<a href="index.fr_FR.html" title="Français">Français</a> - <a href="index.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</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.de_DE.html" title="German">Deutsch (German)</a> -
<a href="index.ca_CA.html" title="Català">Català (Catalan)</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.ro_RO.html" title="Romanian">Română (Romanian)</a> -
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> - <a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
<a href="index.uk_UA.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.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
<a href="index.pl_PL.html" title="Polish">Polski</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.ar_MA.html" title="العربية">العربية</a> - <a href="index.ar_MA.html" title="العربية">العربية</a> -
<a href="index.fa_FA.html" title="فارسی">فارسی</a> - <a href="index.fa_FA.html" title="فارسی">فارسی</a> -
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a> <a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a> <a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
</p> </p>
</header> </header>
<div id="main"> <div id="main">
<div class="scrollblock">
<div class="scrollblock">
<h2>Acerca de git-flow</h2> <h2>Acerca de git-flow</h2>
<p> <p>
git-flow es un conjunto de extensiones para git que proveen comandos de alto nivel para operar repositorios git-flow es un conjunto de extensiones para git que proveen comandos
basados en el modelo de ramificaciones de Vincent de alto nivel para operar repositorios basados en el modelo de
Driessen. ramificaciones de Vincent Driessen.
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">más</a></small> <small
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
>más</a
></small
>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>Esta hoja de referencia explica&nbsp; las operaciones básicas de git-flow, los comandos y sus efectos.</p> <p>
Esta hoja de referencia explica&nbsp; las operaciones básicas de
git-flow, los comandos y sus efectos.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Consejos básicos</h2> <h2>Consejos básicos</h2>
<ul> <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>
<li>El cliente para OSX/Windows <a href="http://www.sourcetreeapp.com/">Sourcetree</a> es una excelente GUI para git y tiene soporte para git-flow 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/Windows
<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> </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> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="setup" href="#setup">Configuración</a></h2> <h2><a name="setup" href="#setup">Configuración</a></h2>
<ul> <ul>
<li>Un prerequisito es una instalación de git en funcionamiento.</li> <li>Un prerequisito es una instalación de git en funcionamiento.</li>
@ -112,48 +169,53 @@
<div class="col-1"> <div class="col-1">
<h3>macOS</h3> <h3>macOS</h3>
<span>Homebrew</span> <span>Homebrew</span>
<blockquote> <blockquote>$ brew install git-flow-avh</blockquote>
$ brew install git-flow-avh
</blockquote>
<span>Macports</span> <span>Macports</span>
<blockquote> <blockquote>$ port install git-flow-avh</blockquote>
$ port install git-flow-avh
</blockquote>
<h3>Linux</h3> <h3>Linux</h3>
<blockquote> <blockquote>$ apt-get install git-flow</blockquote>
$ apt-get install git-flow
</blockquote>
<h3>Windows (Cygwin)</h3> <h3>Windows (Cygwin)</h3>
<blockquote> <blockquote>
$ wget -q -O - --no-check-certificate $ wget -q -O - --no-check-certificate
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
install stable | bash
</blockquote> </blockquote>
<p>Necesitarás wget y util-linux para instalar git-flow.</p> <p>Necesitarás wget y util-linux para instalar git-flow.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <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> 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> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow" />
</div>
</div> </div>
</div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">Introducción</a></h2> <h2>
<p>Git flow necesita ser inicializado para poder alterar la configuración del proyecto.</p> <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">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Inicialización</h3> <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> <p>
Deberá contestar algunas preguntas relacionadas con las convenciones de nombres para las ramas.<br/> 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. Se recomienda utilizar los valores predeterminados.
</p> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="initialize"></div> <div class="initialize"></div>
@ -161,10 +223,9 @@
<div class="lines-open"></div> <div class="lines-open"></div>
<div class="lines-big"></div> <div class="lines-big"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="features" href="#features">Características</a></h2> <h2><a name="features" href="#features">Características</a></h2>
<ul class="narrow"> <ul class="narrow">
@ -175,12 +236,15 @@
<div class="col-1"> <div class="col-1">
<h3>Comenzar una nueva característica</h3> <h3>Comenzar una nueva característica</h3>
<p>El desarrollo de nuevas características parte de la rama 'develop'.</p> <p>
El desarrollo de nuevas características parte de la rama 'develop'.
</p>
<p>Comienze una nueva característica usando</p> <p>Comienze una nueva característica usando</p>
<blockquote> <blockquote>git flow feature start MYFEATURE</blockquote>
git flow feature start MYFEATURE <p>
</blockquote> Esta acción crea una nueva rama derivada de 'develop' y cambia a
<p>Esta acción crea una nueva rama derivada de 'develop' y cambia a esta, estableciéndola como rama de trabajo actual.</p> esta, estableciéndola como rama de trabajo actual.
</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -191,233 +255,248 @@
--> --></div>
</div>
<div class="col-2"> <div class="col-2">
<div class="feature-start"></div> <div class="feature-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finalizar una característica</h3> <h3>Finalizar una característica</h3>
<p> <p>
Finaliza el desarrollo de una característica. Finaliza el desarrollo de una característica. Esta acción realiza lo
Esta acción realiza lo siguiente: siguiente:
</p> </p>
<ul> <ul>
<li>Fusiona MYFEATURE en 'develop'</li> <li>Fusiona MYFEATURE en 'develop'</li>
<li>Borra la rama MYFEATURE</li> <li>Borra la rama MYFEATURE</li>
<li>Cambia a la rama 'develop', estableciéndola como rama de trabajo actual</li> <li>
Cambia a la rama 'develop', estableciéndola como rama de trabajo
actual
</li>
</ul> </ul>
<blockquote> <blockquote>git flow feature finish MYFEATURE</blockquote>
git flow feature finish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-end"></div> <div class="feature-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Publicar una característica</h3> <h3>Publicar una característica</h3>
<p> <p>
¿Estás trabajando colaborativamente? <br/> ¿Estás trabajando colaborativamente? <br />
Publica una característica a un servidor remoto para que así pueda ser vista por otros. Publica una característica a un servidor remoto para que así pueda
ser vista por otros.
</p> </p>
<blockquote> <blockquote>git flow feature publish MYFEATURE</blockquote>
git flow feature publish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-publish"></div> <div class="feature-publish"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Obteniendo características publicadas</h3> <h3>Obteniendo características publicadas</h3>
<p> <p>Obten una característica publicada por otro.</p>
Obten una característica publicada por otro.
</p>
<blockquote> <blockquote>git flow feature pull origin MYFEATURE</blockquote>
git flow feature pull origin MYFEATURE
</blockquote>
<p>
Puedes mantener un seguimiento de sus cambios usando.
</p>
<blockquote>
git flow feature track MYFEATURE
</blockquote>
<p>Puedes mantener un seguimiento de sus cambios usando.</p>
<blockquote>git flow feature track MYFEATURE</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="release" href="#release">Publicar una versión</a></h2> <h2><a name="release" href="#release">Publicar una versión</a></h2>
<ul> <ul>
<li>Prepara una versión para producción</li> <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> <li>
Permite arreglos menores y la preparación de los metadatos para la
publicación
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Comenzar una publicación</h3> <h3>Comenzar una publicación</h3>
<p>Para comenzar una publicación, usa el comando git flow release. Creará
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">&#9733; &#9733; &#9733;</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> <p>
(Puede establecer el seguimiento de los cambios de la publicación remota utilizando el siguiente comando) Para comenzar una publicación, usa el comando git flow release.
<p/> Creará una rama de publicación derivada de la rama 'develop'.
<blockquote> </p>
git flow release track RELEASE <blockquote>git flow release start RELEASE [BASE]</blockquote>
</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">&#9733; &#9733; &#9733;</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 siguiente comando)
</p>
<p />
<blockquote>git flow release track RELEASE</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Concluir una publicación</h3> <h3>Concluir una publicación</h3>
<p>Dar cierre a una publicación es un gran paso. Realiza varias acciones:</p> <p>
Dar cierre a una publicación es un gran paso. Realiza varias
acciones:
</p>
<ul> <ul>
<li>Fusiona la rama de la publicación con la rama 'master'</li> <li>Fusiona la rama de la publicación con la rama 'master'</li>
<li>Etiqueta el cambio con su nombre</li> <li>Etiqueta el cambio con su nombre</li>
<li>Vuelve a fusionar la publicación con la rama 'develop'</li> <li>Vuelve a fusionar la publicación con la rama 'develop'</li>
<li>Borra la rama de la publicación</li> <li>Borra la rama de la publicación</li>
</ul> </ul>
<blockquote> <blockquote>git flow release finish RELEASE</blockquote>
git flow release finish RELEASE <p>No olvides añadir las tags con <code>git push --tags</code></p>
</blockquote>
<p>
No olvides añadir las tags con <code>git push --tags</code>
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-end"></div> <div class="release-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">Revisiones</a></h2> <h2><a name="hotfixes" href="#hotfixes">Revisiones</a></h2>
<ul> <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>
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> </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> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>git flow hotfix start</h3> <h3>git flow hotfix start</h3>
<p>Como otros comandos de git flow, una revisión se abre con</p> <p>Como otros comandos de git flow, una revisión se abre con</p>
<blockquote> <blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
git flow hotfix start VERSION [BASENAME] <p>
</blockquote> El argumento de la versión determina el nombre de la revisión.
<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> Opcionalmente, puede agregar un nombre para la base desde la cual
comenzar.
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Cierra una revisión</h3> <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> <p>
<blockquote> Al cerrar una revisión, esta se fusiona en las ramas 'develop' y
git flow hotfix finish VERSION 'master'. Luego, el cambio en 'master' es etiquetado con el nombre
</blockquote> de la revisión.
</p>
<blockquote>git flow hotfix finish VERSION</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-end"></div> <div class="hotfix-end"></div>
</div> </div>
</div> </div>
<div> <div>
<div class="col-1"></div> <div class="col-1"></div>
<div class="col-2"> <div class="col-2">
<div class="lines-close"></div> <div class="lines-close"></div>
<div class="lines-small-end"></div> <div class="lines-small-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="commands" href="#commands">Comandos</a></h2> <h2><a name="commands" href="#commands">Comandos</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands" />
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Tareas pendientes</h2> <h2>Tareas pendientes</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Aquí no se han cubierto todos los comandos disponibles, sólo los más importantes</li> <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. 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>
<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> <li>Si quiere proveer traducciones, serán bien recibidas.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
</div> </div>
<footer>
<footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Comentarios</a></h2> <h2><a name="comments" href="#comments">Comentarios</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>
</footer> </footer>
<script type="text/javascript"> <script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */ /* * * DON'T EDIT BELOW THIS LINE * * */
(function () { (function () {
var dsq = document.createElement('script'); var dsq = document.createElement("script");
dsq.type = 'text/javascript'; dsq.type = "text/javascript";
dsq.async = true; dsq.async = true;
dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js'; dsq.src = "http://" + disqus_shortname + ".disqus.com/embed.js";
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); (
document.getElementsByTagName("head")[0] ||
document.getElementsByTagName("body")[0]
).appendChild(dsq);
})(); })();
</script> </script>
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a> <noscript
</noscript> >Please enable JavaScript to view the
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a> <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
</noscript>
<a href="http://disqus.com" class="dsq-brlink"
</body> >comments powered by <span class="logo-disqus">Disqus</span></a
>
</body>
</html> </html>

426
index.fa_FA.html
View File

@ -1,117 +1,184 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns="http://www.w3.org/1999/html"> <html lang="en" xmlns="http://www.w3.org/1999/html">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>راهنمای git-flow</title> <title>راهنمای git-flow</title>
<link href='https://fonts.googleapis.com/css?family=Vazirmatn' rel='stylesheet' type='text/css'> <link
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print"> href="https://fonts.googleapis.com/css?family=Vazirmatn"
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print"> rel="stylesheet"
<link rel="preconnect" href="https://fonts.googleapis.com"> type="text/css"
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin> />
<link href='https://fonts.googleapis.com/css?family=Vazirmatn' rel='stylesheet' type='text/css'> <link
<link rel="stylesheet" href="css/style.fa_FA.css" type="text/css" media="screen,print"> 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="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css?family=Vazirmatn"
rel="stylesheet"
type="text/css"
/>
<link
rel="stylesheet"
href="css/style.fa_FA.css"
type="text/css"
media="screen,print"
/>
<script type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-33766650-1']); _gaq.push(["_setAccount", "UA-33766650-1"]);
_gaq.push(['_trackPageview']); _gaq.push(["_trackPageview"]);
(function () { (function () {
var ga = document.createElement('script'); var ga = document.createElement("script");
ga.type = 'text/javascript'; ga.type = "text/javascript";
ga.async = true; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; ga.src =
var s = document.getElementsByTagName('script')[0]; ("https:" == document.location.protocol
? "https://ssl"
: "http://www") + ".google-analytics.com/ga.js";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(ga, s); s.parentNode.insertBefore(ga, s);
})(); })();
</script> </script>
</head> </head>
<body> <body>
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div> <div id="banner">
<header> <a href="https://github.com/danielkummer/git-flow-cheatsheet"
>Fork me on GitHub</a
>
</div>
<header>
<h1 id="title">راهنمای git-flow</h1> <h1 id="title">راهنمای git-flow</h1>
<p id="author"> <p id="author">
ایجاد شده توسط <a href="http://twitter.com/0r1g4m14dd1c7"> دانیل کامر </a> ایجاد شده توسط
<br> <a href="http://twitter.com/0r1g4m14dd1c7"> دانیل کامر </a>
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" <br />
data-size="large"> حساب تویتر </a> <a
<script>!function (d, s, id) { href="https://twitter.com/share"
var js, fjs = d.getElementsByTagName(s)[0]; class="twitter-share-button"
data-via="0r1g4m14dd1c7"
data-size="large"
>
حساب تویتر
</a>
<script>
!(function (d, s, id) {
var js,
fjs = d.getElementsByTagName(s)[0];
if (!d.getElementById(id)) { if (!d.getElementById(id)) {
js = d.createElement(s); js = d.createElement(s);
js.id = id; js.id = id;
js.src = "//platform.twitter.com/widgets.js"; js.src = "//platform.twitter.com/widgets.js";
fjs.parentNode.insertBefore(js, fjs); fjs.parentNode.insertBefore(js, fjs);
} }
}(document, "script", "twitter-wjs");</script> })(document, "script", "twitter-wjs");
</script>
</p> </p>
<p id="desc"> شاخه‌بندی بهینه با git-flow توسط <a href="http://nvie.com/">وینسنت دریسن</a></p> <p id="desc">
<p id="translations">translations: شاخه‌بندی بهینه با git-flow توسط
<a href="#" class="active" title="english">English</a> - <a href="http://nvie.com/">وینسنت دریسن</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.es_ES.html" title="spanish">Castellano</a> -
<a href="index.pt_BR.html" title="Português Brasileiro">Português Brasileiro</a> - <a href="index.pt_BR.html" title="Português Brasileiro"
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - >Português Brasileiro</a
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - >
<a href="index.ja_JP.html" title="日本語">日本語</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.tr_TR.html" title="Turkce">Türkçe</a> -
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</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.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</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.de_DE.html" title="German">Deutsch (German)</a> -
<a href="index.ca_CA.html" title="Català">Català (Catalan)</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.ro_RO.html" title="Romanian">Română (Romanian)</a> -
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> - <a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
<a href="index.uk_UA.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.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
<a href="index.pl_PL.html" title="Polish">Polski</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.ar_MA.html" title="العربية">العربية</a> - <a href="index.ar_MA.html" title="العربية">العربية</a> -
<a href="index.fa_FA.html" title="فارسی">فارسی</a> - <a href="index.fa_FA.html" title="فارسی">فارسی</a> -
<a href="index.lt_LT.html" title="Lithuanian">Lietuviškai (Lithuanian)</a> - <a href="index.lt_LT.html" title="Lithuanian"
>Lietuviškai (Lithuanian)</a
>
-
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a> <a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a> <a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
</p> </p>
</header> </header>
<div id="main">
<div id="main">
<div class="scrollblock"> <div class="scrollblock">
<h2>درباره</h2> <h2>درباره</h2>
<p> <p>
git-flow مجموعه‌ای از تعمیم‌های گیت برای ساده سازی عملیات سطح بالا روی مخازن با مدل شاخه‌بندی وینسنت دریسن git-flow مجموعه‌ای از تعمیم‌های گیت برای ساده سازی عملیات سطح بالا روی
است. مخازن با مدل شاخه‌بندی وینسنت دریسن است.
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">بیشتر</a></small> <small
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
>بیشتر</a
></small
>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>این برگه تقلب، استفاده‌های پایه و تاثیر عملیات git-flow را نشان می‌دهد.</p> <p>
این برگه تقلب، استفاده‌های پایه و تاثیر عملیات git-flow را نشان
می‌دهد.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>راهنمایی‌های اولیه</h2> <h2>راهنمایی‌های اولیه</h2>
<ul> <ul>
<li>گیت فلو راهنمایی‌های خوبی در مورد دستورات و خروجی آن‌ها فراهم می‌کند. مطالب را با دقت مطالعه کنید تا <li>
ببنید گیت فلو راهنمایی‌های خوبی در مورد دستورات و خروجی آن‌ها فراهم
چه اتفاقی دارد می‌افتد... می‌کند. مطالب را با دقت مطالعه کنید تا ببنید چه اتفاقی دارد
می‌افتد...
</li> </li>
<li> برای کاربران OSX یا ویندوز<a href="http://www.sourcetreeapp.com/"> Sourcetree </a> یک ابزار عالی است که <li>
محیط گرافیکی دارد و از git-flow پشتیبانی می‌کند. برای کاربران OSX یا ویندوز<a href="http://www.sourcetreeapp.com/">
Sourcetree
</a>
یک ابزار عالی است که محیط گرافیکی دارد و از git-flow پشتیبانی
می‌کند.
</li> </li>
<li>گیت فلو یک راهکار بر اساس ادغام (merge based) است و شاخه‌های feature (ویژگی، قابلیت) را بازسازی (rebase) <li>
نمی‌کند. گیت فلو یک راهکار بر اساس ادغام (merge based) است و شاخه‌های feature
(ویژگی، قابلیت) را بازسازی (rebase) نمی‌کند.
</li> </li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="setup" href="#setup">نصب و راه‌اندازی</a></h2> <h2><a name="setup" href="#setup">نصب و راه‌اندازی</a></h2>
<ul> <ul>
@ -122,46 +189,52 @@
<div class="col-1"> <div class="col-1">
<h3>برای OSX</h3> <h3>برای OSX</h3>
<span> Homebrew استفاده از ابزار</span> <span> Homebrew استفاده از ابزار</span>
<blockquote> <blockquote>$ brew install git-flow-avh</blockquote>
$ brew install git-flow-avh
</blockquote>
<span>Macports استفاده از ابزار</span> <span>Macports استفاده از ابزار</span>
<blockquote> <blockquote>$ port install git-flow-avh</blockquote>
$ port install git-flow-avh
</blockquote>
<h3>لینوکس</h3> <h3>لینوکس</h3>
<blockquote> <blockquote>$ apt-get install git-flow</blockquote>
$ apt-get install git-flow
</blockquote>
<h3>ویندوز (ابزار Cygwin)</h3> <h3>ویندوز (ابزار Cygwin)</h3>
<blockquote> <blockquote>
$ wget -q -O - --no-check-certificate $ wget -q -O - --no-check-certificate
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
bash install stable | bash
</blockquote> </blockquote>
<p>شما دو ابزار wget و util-linux را برای نصب git-flow نیاز دارید.</p> <p>شما دو ابزار wget و util-linux را برای نصب git-flow نیاز دارید.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p>برای دانستن جزییات بیشتر در مورد نصب گیت فلو، لطفا از <a <p>
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">ویکی پیج گیت فلو</a> بازدید برای دانستن جزییات بیشتر در مورد نصب گیت فلو، لطفا از
کنید.</p> <a
<img src="img/download.png" alt="install git-flow"/> href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
>ویکی پیج گیت فلو</a
>
بازدید کنید.
</p>
<img src="img/download.png" alt="install git-flow" />
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">شروع کار</a></h2> <h2><a name="getting_started" href="#getting_started">شروع کار</a></h2>
<p>در ابتدا نیاز است گیت فلو برای اعمال تغییرات روی پروژه شما آغاز (مقداردهی اولیه) شود. </p> <p>
در ابتدا نیاز است گیت فلو برای اعمال تغییرات روی پروژه شما آغاز
(مقداردهی اولیه) شود.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>آغاز</h3> <h3>آغاز</h3>
<p>استفاده از گیت فلو را با دستور زیر در یک مخزن گیت -که از قبل ایجاد شده و وجود دارد- آغاز کنید.</p> <p>
<blockquote> استفاده از گیت فلو را با دستور زیر در یک مخزن گیت -که از قبل ایجاد
git flow init شده و وجود دارد- آغاز کنید.
</blockquote> </p>
<p>شما باید چندین سوال را برای تعیین نام‌گذاری شاخه‌های (branches) خود پاسخ دهید. پیشنهاد می‌شود از مقادیر <blockquote>git flow init</blockquote>
پیشفرض برای این کار استفاده کنید. </p> <p>
شما باید چندین سوال را برای تعیین نام‌گذاری شاخه‌های (branches) خود
پاسخ دهید. پیشنهاد می‌شود از مقادیر پیشفرض برای این کار استفاده
کنید.
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="initialize"></div> <div class="initialize"></div>
@ -171,7 +244,6 @@
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="features" href="#features">ویژگی‌ها</a></h2> <h2><a name="features" href="#features">ویژگی‌ها</a></h2>
@ -185,10 +257,11 @@
<h3>آغاز ایجاد یک ویژگی جدید</h3> <h3>آغاز ایجاد یک ویژگی جدید</h3>
<p>توسعه ویژگی‌های جدید که از شاخه 'develop' آغاز می‌شوند!</p> <p>توسعه ویژگی‌های جدید که از شاخه 'develop' آغاز می‌شوند!</p>
<p>توسعه یک ویژگی جدید را با دستور زیر شروع کنید</p> <p>توسعه یک ویژگی جدید را با دستور زیر شروع کنید</p>
<blockquote> <blockquote>git flow feature start MYFEATURE</blockquote>
git flow feature start MYFEATURE <p>
</blockquote> این دستور بر اساس شاخه 'develop' ویژگی جدیدی را می‌سازد و به صورت
<p>این دستور بر اساس شاخه 'develop' ویژگی جدیدی را می‌سازد و به صورت خودکار روی آن جابجا می‌شود.</p> خودکار روی آن جابجا می‌شود.
</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -209,16 +282,17 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>اتمام ویژگی</h3> <h3>اتمام ویژگی</h3>
<p>توسعه یک ویژگی را به پایان می‌رساند، این دستور نتایج زیر را خواهد داشت:</p> <p>
توسعه یک ویژگی را به پایان می‌رساند، این دستور نتایج زیر را خواهد
داشت:
</p>
<ul> <ul>
<li>MYFEATURE را با شاخه 'develop' ادغام می‌کند.</li> <li>MYFEATURE را با شاخه 'develop' ادغام می‌کند.</li>
<li>شاخه ویژگی را حذف می‌کند.</li> <li>شاخه ویژگی را حذف می‌کند.</li>
<li>دوباره به شاخه‌ی 'develop' برمی‌گردد.</li> <li>دوباره به شاخه‌ی 'develop' برمی‌گردد.</li>
</ul> </ul>
<blockquote> <blockquote>git flow feature finish MYFEATURE</blockquote>
git flow feature finish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-end"></div> <div class="feature-end"></div>
@ -230,13 +304,12 @@
<h3>انتشار یک ویژگی</h3> <h3>انتشار یک ویژگی</h3>
<p> <p>
آیا شما در حال توسعه‌ی یک ویژگی در یک پروژه مشارکتی هستید؟ <br/> آیا شما در حال توسعه‌ی یک ویژگی در یک پروژه مشارکتی هستید؟ <br />
ویژگی را روی ریموت سرور منتشر کنید تا برای سایر اعضا قابل استفاده باشد. ویژگی را روی ریموت سرور منتشر کنید تا برای سایر اعضا قابل استفاده
باشد.
</p> </p>
<blockquote> <blockquote>git flow feature publish MYFEATURE</blockquote>
git flow feature publish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-publish"></div> <div class="feature-publish"></div>
@ -247,49 +320,53 @@
<div class="col-1"> <div class="col-1">
<h3>دریافت ویژگی‌های منتشر شده</h3> <h3>دریافت ویژگی‌های منتشر شده</h3>
<p>قابلیتی را که عضو دیگری منتشر کرده است را دریافت کنید.</p>
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
<p> <p>
قابلیتی را که عضو دیگری منتشر کرده است را دریافت کنید. شما می‌توانید توسعه یک ویژگی رو از مبدا، با دستور زیر، زیر نظر داشته
باشید. <code> git flow feature track MYFEATURE</code>
</p> </p>
<blockquote>
git flow feature pull origin MYFEATURE
</blockquote>
<p>شما می‌توانید توسعه یک ویژگی رو از مبدا، با دستور زیر، زیر نظر داشته باشید. <code> git flow feature track
MYFEATURE</code></p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="release" href="#release">ایجاد یک انتشار</a></h2> <h2><a name="release" href="#release">ایجاد یک انتشار</a></h2>
<ul> <ul>
<li>تهیه‌ی پشتیبان از انتشار محصول جدید</li> <li>تهیه‌ی پشتیبان از انتشار محصول جدید</li>
<li>اجازه برای رفع باگ‌های جزئی و آماده کردن متا دیتا‌ها برای انتشار</li> <li>
اجازه برای رفع باگ‌های جزئی و آماده کردن متا دیتا‌ها برای انتشار
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>شروع یک انتشار</h3> <h3>شروع یک انتشار</h3>
<p>برای استارت یک انتشار، دستور 'git flow release' را بکار ببرید. این دستور یک شاخه انتشار از روی شاخه <p>
'develop' ایجاد می‌کند.</p> برای استارت یک انتشار، دستور 'git flow release' را بکار ببرید. این
<blockquote> دستور یک شاخه انتشار از روی شاخه 'develop' ایجاد می‌کند.
git flow release start RELEASE [BASE] </p>
</blockquote> <blockquote>git flow release start RELEASE [BASE]</blockquote>
<p>شما به صورت اختیاری می‌توانید به جای <code>[BASE]</code> از کد sha-1 یک کامیت (ثبت تغییرات) خود برای استارت انتشار <p>
از آنجا استفاده کنید. کامیت باید روی برنج 'develop' باشد.</p> شما به صورت اختیاری می‌توانید به جای <code>[BASE]</code> از کد sha-1
یک کامیت (ثبت تغییرات) خود برای استارت انتشار از آنجا استفاده کنید.
کامیت باید روی برنج 'develop' باشد.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>بهتر است شاخه انتشار را پس از ایجاد منتشر کنید تا سایر توسعه‌دهنگان نیز بتوانند روی شاخه انتشار کامیت <p>
کنند. بهتر است شاخه انتشار را پس از ایجاد منتشر کنید تا سایر توسعه‌دهنگان
مشابه انتشار یک ویژگی با دستور زیر اینکار را انجام دهید:</p> نیز بتوانند روی شاخه انتشار کامیت کنند. مشابه انتشار یک ویژگی با
<blockquote> دستور زیر اینکار را انجام دهید:
git flow release publish RELEASE </p>
</blockquote> <blockquote>git flow release publish RELEASE</blockquote>
<p>شما می‌توانید انتشار ریموت را، با دستور زیر، زیر نظر داشته باشید. <code>git flow release track <p>
RELEASE</code></p> شما می‌توانید انتشار ریموت را، با دستور زیر، زیر نظر داشته باشید.
<code>git flow release track RELEASE</code>
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
@ -300,22 +377,24 @@
<div class="col-1"> <div class="col-1">
<h3>اتمام یک انتشار</h3> <h3>اتمام یک انتشار</h3>
<p>اتمام یک انتشار، بخش بزرگی از برنچینگ و شاخه‌بندی گیت است، که باعث رخدادهای زیر می‌شود:</p> <p>
اتمام یک انتشار، بخش بزرگی از برنچینگ و شاخه‌بندی گیت است، که باعث
رخدادهای زیر می‌شود:
</p>
<ul> <ul>
<li>شاخه انتشار را با شاخه 'master' ادغام می‌کند.</li> <li>شاخه انتشار را با شاخه 'master' ادغام می‌کند.</li>
<li>انتشار را با نامی که روی آن گذاشته شده، برجسب می‌زند!</li> <li>انتشار را با نامی که روی آن گذاشته شده، برجسب می‌زند!</li>
<li>همجنین شاخه انتشار را با شاخه 'develop' ادغام می‌کند.</li> <li>همجنین شاخه انتشار را با شاخه 'develop' ادغام می‌کند.</li>
<li>شاخه انتشار را حذف می‌کند.</li> <li>شاخه انتشار را حذف می‌کند.</li>
</ul> </ul>
<blockquote> <blockquote>git flow release finish RELEASE</blockquote>
git flow release finish RELEASE <p>
</blockquote> فراموش نکنید که برجسب‌های(تگ‌ها) خود را پوش کنید!
<p>فراموش نکنید که برجسب‌های(تگ‌ها) خود را پوش کنید! <code>git push --tags</code></p> <code>git push --tags</code>
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-end"></div> <div class="release-end"></div>
</div> </div>
</div> </div>
@ -323,24 +402,28 @@
<h2><a name="hotfixes" href="#hotfixes">اصلاحات</a></h2> <h2><a name="hotfixes" href="#hotfixes">اصلاحات</a></h2>
<ul> <ul>
<li>اصلاحیه‌ها از ضرورت تغییر فوری، در یک نسخه محصول درحال اجرا (در دسترس کاربران و عموم)، پس از یک بروز یک وضعیت <li>
ناخواسته، حاصل می شود. اصلاحیه‌ها از ضرورت تغییر فوری، در یک نسخه محصول درحال اجرا (در
دسترس کاربران و عموم)، پس از یک بروز یک وضعیت ناخواسته، حاصل می شود.
</li> </li>
<li>ممکن است شاخه‌بندی آن‌ها از برجسبی که روی شاخه 'master' برای آن نسخه از محصول وجود دارد، باشد. <li>
ممکن است شاخه‌بندی آن‌ها از برجسبی که روی شاخه 'master' برای آن نسخه
از محصول وجود دارد، باشد.
</li> </li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>شروع یک اصلاحیه</h3> <h3>شروع یک اصلاحیه</h3>
<p>مانند سایر دستورات گیت فلو، اصلاح‌ها هم با دستور زیر شروع می‌شوند:</p> <p>
<blockquote> مانند سایر دستورات گیت فلو، اصلاح‌ها هم با دستور زیر شروع می‌شوند:
git flow hotfix start VERSION [BASENAME] </p>
</blockquote> <blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
<p>متغیر ورژن برای نامگذاری انتشار اصلاح، بکار‌ می‌رود که پیشنهاد می‌شود از یک نام پایه برای این‌ کار استفاده <p>
کنید.</p> متغیر ورژن برای نامگذاری انتشار اصلاح، بکار‌ می‌رود که پیشنهاد
می‌شود از یک نام پایه برای این‌ کار استفاده کنید.
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
@ -351,11 +434,12 @@
<div class="col-1"> <div class="col-1">
<h3>اتمام یک اصلاح</h3> <h3>اتمام یک اصلاح</h3>
<p>با اتمام یک اصلاح، آن شاخه با شاخه‌های 'develop' و 'master' ادغام می‌شود. همچنین ادغام با شاخه 'master' <p>
با ورژن اصلاح برجسب‌گذاری می‌شود.</p> با اتمام یک اصلاح، آن شاخه با شاخه‌های 'develop' و 'master' ادغام
<blockquote> می‌شود. همچنین ادغام با شاخه 'master' با ورژن اصلاح برجسب‌گذاری
git flow hotfix finish VERSION می‌شود.
</blockquote> </p>
<blockquote>git flow hotfix finish VERSION</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-end"></div> <div class="hotfix-end"></div>
@ -370,54 +454,66 @@
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="commands" href="#commands">دستورات</a></h2> <h2><a name="commands" href="#commands">دستورات</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands" />
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>جمع‌بندی</h2> <h2>جمع‌بندی</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>در این نوشته فقط مهمترین دستورات بررسی شده‌اند و همه دستورات تشریح نشده‌اند.</li> <li>
<li>شما هنوز می‌توانید از گیت و تمامی دستورات آن، همانطور که می‌دانید استفاده کنید، گیت فلو فقط یک مجموعه در این نوشته فقط مهمترین دستورات بررسی شده‌اند و همه دستورات تشریح
ابزار است. نشده‌اند.
</li>
<li>
شما هنوز می‌توانید از گیت و تمامی دستورات آن، همانطور که می‌دانید
استفاده کنید، گیت فلو فقط یک مجموعه ابزار است.
</li>
<li>
ویژگی 'support' هنوز در نسخه بتا قرار دارد، استفاده از آن پیشنهاد
نمی‌شود.
</li>
<li>
اگر دوست دارید ترجمه جدیدی ارائه‌ دهید، خوشحال می‌شوم از آن‌ها
استفاده کنم.
</li> </li>
<li>ویژگی 'support' هنوز در نسخه بتا قرار دارد، استفاده از آن پیشنهاد نمی‌شود.</li>
<li>اگر دوست دارید ترجمه جدیدی ارائه‌ دهید، خوشحال می‌شوم از آن‌ها استفاده کنم.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
</div> </div>
<footer>
<footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">نظرات کاربران</a></h2> <h2><a name="comments" href="#comments">نظرات کاربران</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>
</footer> </footer>
<script type="text/javascript"> <script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */ /* * * DON'T EDIT BELOW THIS LINE * * */
(function () { (function () {
var dsq = document.createElement('script'); var dsq = document.createElement("script");
dsq.type = 'text/javascript'; dsq.type = "text/javascript";
dsq.async = true; dsq.async = true;
dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js'; dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); (
document.getElementsByTagName("head")[0] ||
document.getElementsByTagName("body")[0]
).appendChild(dsq);
})(); })();
</script> </script>
<noscript>لطفا برای نمایش نظرات، جاوا اسکریپت را فعال نمایید <a href="http://disqus.com/?ref_noscript">نظرات، نیرو گرفته <noscript
از Disqus.</a> >لطفا برای نمایش نظرات، جاوا اسکریپت را فعال نمایید
</noscript> <a href="http://disqus.com/?ref_noscript">نظرات، نیرو گرفته از Disqus.</a>
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a> </noscript>
<a href="http://disqus.com" class="dsq-brlink"
>comments powered by <span class="logo-disqus">Disqus</span></a
</body> >
</body>
</html> </html>

1
index.fr_FR.html
View File

@ -55,6 +55,7 @@
<a href="index.tr_TR.html" title="Turkce">Türkçe</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.ko_KR.html" title="한국어">한국어(Korean)</a> -
<a href="#" class="active" title="Français">Français</a> - <a href="#" class="active" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> - <a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -

423
index.hr_HR.html
View File

@ -1,110 +1,165 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns="http://www.w3.org/1999/html"> <html lang="en" xmlns="http://www.w3.org/1999/html">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>git-flow cheatsheet</title> <title>git-flow cheatsheet</title>
<link href='https://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'> <link
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print"> href="https://fonts.googleapis.com/css?family=Sansita+One"
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print"> 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 type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-33766650-1']); _gaq.push(["_setAccount", "UA-33766650-1"]);
_gaq.push(['_trackPageview']); _gaq.push(["_trackPageview"]);
(function () { (function () {
var ga = document.createElement('script'); var ga = document.createElement("script");
ga.type = 'text/javascript'; ga.type = "text/javascript";
ga.async = true; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; ga.src =
var s = document.getElementsByTagName('script')[0]; ("https:" == document.location.protocol
? "https://ssl"
: "http://www") + ".google-analytics.com/ga.js";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(ga, s); s.parentNode.insertBefore(ga, s);
})(); })();
</script> </script>
</head> </head>
<body> <body>
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div> <div id="banner">
<header> <a href="https://github.com/danielkummer/git-flow-cheatsheet"
>Fork me on GitHub</a
>
</div>
<header>
<h1 id="title">git-flow šalabahter</h1> <h1 id="title">git-flow šalabahter</h1>
<p id="author"> <p id="author">
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> 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> <a
<script>!function (d, s, id) { href="https://twitter.com/share"
var js, fjs = d.getElementsByTagName(s)[0]; 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)) { if (!d.getElementById(id)) {
js = d.createElement(s); js = d.createElement(s);
js.id = id; js.id = id;
js.src = "//platform.twitter.com/widgets.js"; js.src = "//platform.twitter.com/widgets.js";
fjs.parentNode.insertBefore(js, fjs); fjs.parentNode.insertBefore(js, fjs);
} }
}(document, "script", "twitter-wjs");</script> })(document, "script", "twitter-wjs");
</script>
</p> </p>
<p id="desc">efikasno branchanje koristeći git-flow <a href="http://nvie.com/">Vincenta Driessena</a></p> <p id="desc">
<p id="translations">prijevodi: efikasno branchanje koristeći git-flow
<a href="#" class="active" title="english">English</a> - <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.es_ES.html" title="spanish">Castellano</a> -
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> - <a href="index.pt_BR.html" title="Brazilian Portugues"
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - >Brazilian Portugues</a
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - >
<a href="index.ja_JP.html" title="日本語">日本語</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.tr_TR.html" title="Turkce">Türkçe</a> -
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</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.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</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.de_DE.html" title="German">Deutsch (German)</a> -
<a href="index.ca_CA.html" title="Català">Català (Catalan)</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.ro_RO.html" title="Romanian">Română (Romanian)</a> -
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> - <a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
<a href="index.uk_UA.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.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
<a href="index.pl_PL.html" title="Polish">Polski</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.hr_HR.html" title="Croatian">Hrvatski</a> -
<a href="index.ar_MA.html" title="العربية">العربية</a> - <a href="index.ar_MA.html" title="العربية">العربية</a> -
<a href="index.fa_FA.html" title="فارسی">فارسی</a> - <a href="index.fa_FA.html" title="فارسی">فارسی</a> -
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a> <a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a> <a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
</p> </p>
</header> </header>
<div id="main"> <div id="main">
<div class="scrollblock">
<div class="scrollblock">
<h2>O git-flowu</h2> <h2>O git-flowu</h2>
<p> <p>
git-flow je skup ekstenzija koje omogućuju da se operacije na repozitoriju, koje implementiraju git-flow je skup ekstenzija koje omogućuju da se operacije na
branching model Vincenta Driessena, obavljaju lakše. repozitoriju, koje implementiraju branching model Vincenta Driessena,
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">more</a></small> obavljaju lakše.
<small
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
>more</a
></small
>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>Ovaj šalabahter prikazuje osnovnu uporabu i efekte git-flow operacija</p> <p>
Ovaj šalabahter prikazuje osnovnu uporabu i efekte git-flow operacija
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Osnovni savjeti</h2> <h2>Osnovni savjeti</h2>
<ul> <ul>
<li>Git flow ima izvrsnu pomoć i izlaz na komandnoj liniji. Pažljivo čitajte da vidite što se dešava...</li> <li>
<li>macOS/Windows klijent <a href="http://www.sourcetreeapp.com/">Sourcetree</a> je izvrstan GUI alat za git koji nudi Git flow ima izvrsnu pomoć i izlaz na komandnoj liniji. Pažljivo
podršku i za git-flow. čitajte da vidite što se dešava...
</li>
<li>
macOS/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> </li>
<li>Git-flow je rješenje zasnovano na mergeovima. Ne vrši se rebase brancheva sa novim razvijenim funkcionalnostima.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="setup" href="#setup">Postavljanje</a></h2> <h2><a name="setup" href="#setup">Postavljanje</a></h2>
<ul> <ul>
<li>Potrebna je funckcionirajuća git instalacaija.</li> <li>Potrebna je funckcionirajuća git instalacaija.</li>
@ -114,49 +169,51 @@
<div class="col-1"> <div class="col-1">
<h3>macOS</h3> <h3>macOS</h3>
<span>Homebrew</span> <span>Homebrew</span>
<blockquote> <blockquote>$ brew install git-flow-avh</blockquote>
$ brew install git-flow-avh
</blockquote>
<span>Macports</span> <span>Macports</span>
<blockquote> <blockquote>$ port install git-flow-avh</blockquote>
$ port install git-flow-avh
</blockquote>
<h3>Linux</h3> <h3>Linux</h3>
<blockquote> <blockquote>$ apt-get install git-flow</blockquote>
$ apt-get install git-flow
</blockquote>
<h3>Windows (Cygwin)</h3> <h3>Windows (Cygwin)</h3>
<blockquote> <blockquote>
$ wget -q -O - --no-check-certificate $ wget -q -O - --no-check-certificate
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
install stable | bash
</blockquote> </blockquote>
<p>Trebate wget i util-linux za instaliranje git-flow.</p> <p>Trebate wget i util-linux za instaliranje git-flow.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <p>
Za detaljne instalacijske upute posjetite <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow Za detaljne instalacijske upute posjetite
wiki</a>. <a
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
>git flow wiki</a
>.
</p> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow" />
</div>
</div> </div>
</div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">Osnove</a></h2> <h2><a name="getting_started" href="#getting_started">Osnove</a></h2>
<p>Git flow je potrebno inicijalizirati da prilagodite postavke svog projekta.</p> <p>
Git flow je potrebno inicijalizirati da prilagodite postavke svog
projekta.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Inicijalizacija</h3> <h3>Inicijalizacija</h3>
<p>Započnite sa git-flow inicijalizaciranjem istog u postojećem git repozitoriju:</p>
<blockquote>
git flow init
</blockquote>
<p> <p>
Potrebno je odgovoriti na par pitanja vezano uz konvencije imenovanja brancheva.<br/> 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. Preporuča se uporaba pretpostavljenih vrijednosti.
</p> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="initialize"></div> <div class="initialize"></div>
@ -164,10 +221,9 @@
<div class="lines-open"></div> <div class="lines-open"></div>
<div class="lines-big"></div> <div class="lines-big"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="features" href="#features">Funkcionalnosti</a></h2> <h2><a name="features" href="#features">Funkcionalnosti</a></h2>
<ul class="narrow"> <ul class="narrow">
@ -180,10 +236,11 @@
<h3>Početak nove funkcionalnosti</h3> <h3>Početak nove funkcionalnosti</h3>
<p>Nove funkcionalnost započinju se iz 'develop' brancha.</p> <p>Nove funkcionalnost započinju se iz 'develop' brancha.</p>
<p>Otpočnite razvoj nove funkcionalnosti sa:</p> <p>Otpočnite razvoj nove funkcionalnosti sa:</p>
<blockquote> <blockquote>git flow feature start MYFEATURE</blockquote>
git flow feature start MYFEATURE <p>
</blockquote> Ova akcija kreira branch za novu funkcionalnost baziran na 'develop'
<p>Ova akcija kreira branch za novu funkcionalnost baziran na 'develop' i prebacuje u njega</p> i prebacuje u njega
</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -194,20 +251,18 @@
--> --></div>
</div>
<div class="col-2"> <div class="col-2">
<div class="feature-start"></div> <div class="feature-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Dovršavnje funkcionalnosti</h3> <h3>Dovršavnje funkcionalnosti</h3>
<p> <p>
Dovršite razvoj nove funkcionalnosti. Dovršite razvoj nove funkcionalnosti. Ova akcija izvršava slijedeće
Ova akcija izvršava slijedeće
</p> </p>
<ul> <ul>
<li>Mergea MYFEATURE u 'develop'</li> <li>Mergea MYFEATURE u 'develop'</li>
@ -215,197 +270,219 @@
<li>Prebacuje natrag u 'develop' branch</li> <li>Prebacuje natrag u 'develop' branch</li>
</ul> </ul>
<blockquote> <blockquote>git flow feature finish MYFEATURE</blockquote>
git flow feature finish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-end"></div> <div class="feature-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Publiciranje funkcionalnosti</h3> <h3>Publiciranje funkcionalnosti</h3>
<p> <p>
Razvijate li funkcionalnost zajedno s nekim? <br/> Razvijate li funkcionalnost zajedno s nekim? <br />
Publicirajte funkcionalnost na udaljeni server tako da ju mogu koristiti drugi korisnici. Publicirajte funkcionalnost na udaljeni server tako da ju mogu
koristiti drugi korisnici.
</p> </p>
<blockquote> <blockquote>git flow feature publish MYFEATURE</blockquote>
git flow feature publish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-publish"></div> <div class="feature-publish"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Preuzimanje publicirane funkcionalnosti</h3> <h3>Preuzimanje publicirane funkcionalnosti</h3>
<p>Preuzmite funkcionalnost koju je netko razvio.</p>
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
<p> <p>
Preuzmite funkcionalnost koju je netko razvio. Možete pratiti razvoj funkcionalnost sa:
<code> git flow feature track MYFEATURE</code>
</p> </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>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="release" href="#release">Release</a></h2> <h2><a name="release" href="#release">Release</a></h2>
<ul> <ul>
<li>Podrška za publiciranje release-a na produkciju</li> <li>Podrška za publiciranje release-a na produkciju</li>
<li>Omogućavanje ispravke manjig bugova i pripremu metapodataka za release</li> <li>
Omogućavanje ispravke manjig bugova i pripremu metapodataka za
release
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Započnite release</h3> <h3>Započnite release</h3>
<p>Da započnete release, koristite git flow release komandu. Kreira release branch kreiran iz 'develop' branch-a.</p> <p>
<blockquote> Da započnete release, koristite git flow release komandu. Kreira
git flow release start RELEASE [BASE] release branch kreiran iz 'develop' branch-a.
</blockquote> </p>
<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> <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">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>Bilo bi pametno publicirati release branch nakon kreiranja da se omoguće release commit-i <p>
od ostalih developera. Slično publiciranju funkcionlanosti:</p> Bilo bi pametno publicirati release branch nakon kreiranja da se
<blockquote> omoguće release commit-i od ostalih developera. Slično publiciranju
git flow release publish RELEASE funkcionlanosti:
</blockquote> </p>
<p>(Možete pratiti udaljeni release sa <br/><code>git flow release track RELEASE</code> komandom)</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>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Dovršavanje release-a</h3> <h3>Dovršavanje release-a</h3>
<p>Dovršiti release je veliki korak u git branchanju. Izvršava nekoliko akcija:</p> <p>
Dovršiti release je veliki korak u git branchanju. Izvršava nekoliko
akcija:
</p>
<ul> <ul>
<li>Merge-a release branch natrag u 'master'</li> <li>Merge-a release branch natrag u 'master'</li>
<li>Tagira release sa njegovim nazivom</li> <li>Tagira release sa njegovim nazivom</li>
<li>Merge-a release natrag u 'develop'</li> <li>Merge-a release natrag u 'develop'</li>
<li>Uklanja release branch</li> <li>Uklanja release branch</li>
</ul> </ul>
<blockquote> <blockquote>git flow release finish RELEASE</blockquote>
git flow release finish RELEASE <p>
</blockquote> Ne zaboravite da pošaljete tagove sa <code>git push --tags</code>
<p>Ne zaboravite da pošaljete tagove sa <code>git push --tags</code></p> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-end"></div> <div class="release-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">Brze prepravke</a></h2> <h2><a name="hotfixes" href="#hotfixes">Brze prepravke</a></h2>
<ul> <ul>
<li>Kada je potrebno brzinski ispraviti greške na produkciji, koristi se hotfix mogućnost. <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> </li>
<li>Može se napraviti branch iz odgovarajućeg taga na master branchu koji označava produkcijsku verziju.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>git flow hotfix start</h3> <h3>git flow hotfix start</h3>
<p>Kao i druge git flow komande, hotfix se započinje sa</p> <p>Kao i druge git flow komande, hotfix se započinje sa</p>
<blockquote> <blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
git flow hotfix start VERSION [BASENAME] <p>
</blockquote> Argumet 'version' označava naziv hotfix release-a. Dodatno, možete
<p>Argumet 'version' označava naziv hotfix release-a. Dodatno, možete specificirati 'basename' iz kojeg se započinje hotfix.</p> specificirati 'basename' iz kojeg se započinje hotfix.
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Dovršavanje hotfixa</h3> <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> <p>
<blockquote> Dovršavanje, hotfix ibiva merge-an natrag u 'develop' i 'master'.
git flow hotfix finish VERSION Dodatno, merge u 'master' mbiva tagiran sa verzijom hotfixa.
</blockquote> </p>
<blockquote>git flow hotfix finish VERSION</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-end"></div> <div class="hotfix-end"></div>
</div> </div>
</div> </div>
<div> <div>
<div class="col-1"></div> <div class="col-1"></div>
<div class="col-2"> <div class="col-2">
<div class="lines-close"></div> <div class="lines-close"></div>
<div class="lines-small-end"></div> <div class="lines-small-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="commands" href="#commands">Komande</a></h2> <h2><a name="commands" href="#commands">Komande</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands" />
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Backlog</h2> <h2>Backlog</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Nisu sve moguće komande, samo one načešće korištene</li> <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>
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>
<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> <li>Pošaljite svoje prijevode, rado ću ih integrirati</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
</div> </div>
<footer>
<footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Comments</a></h2> <h2><a name="comments" href="#comments">Comments</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>
</footer> </footer>
<script type="text/javascript"> <script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */ /* * * DON'T EDIT BELOW THIS LINE * * */
(function () { (function () {
var dsq = document.createElement('script'); var dsq = document.createElement("script");
dsq.type = 'text/javascript'; dsq.type = "text/javascript";
dsq.async = true; dsq.async = true;
dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js'; dsq.src = "http://" + disqus_shortname + ".disqus.com/embed.js";
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); (
document.getElementsByTagName("head")[0] ||
document.getElementsByTagName("body")[0]
).appendChild(dsq);
})(); })();
</script> </script>
<noscript>Molim, omogućite JavaScript da bi vidjeli <a href="http://disqus.com/?ref_noscript">komentare na Disqusu.</a> <noscript
</noscript> >Molim, omogućite JavaScript da bi vidjeli
<a href="http://disqus.com" class="dsq-brlink">Komentari putem <span class="logo-disqus">Disqus</span></a> <a href="http://disqus.com/?ref_noscript">komentare na Disqusu.</a>
</noscript>
<a href="http://disqus.com" class="dsq-brlink"
</body> >Komentari putem <span class="logo-disqus">Disqus</span></a
>
</body>
</html> </html>

444
index.html
View File

@ -1,110 +1,168 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns="http://www.w3.org/1999/html"> <html lang="en" xmlns="http://www.w3.org/1999/html">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>git-flow cheatsheet</title> <title>git-flow cheatsheet</title>
<link href='https://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'> <link
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print"> href="https://fonts.googleapis.com/css?family=Sansita+One"
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print"> 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 type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-33766650-1']); _gaq.push(["_setAccount", "UA-33766650-1"]);
_gaq.push(['_trackPageview']); _gaq.push(["_trackPageview"]);
(function () { (function () {
var ga = document.createElement('script'); var ga = document.createElement("script");
ga.type = 'text/javascript'; ga.type = "text/javascript";
ga.async = true; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; ga.src =
var s = document.getElementsByTagName('script')[0]; ("https:" == document.location.protocol
? "https://ssl"
: "http://www") + ".google-analytics.com/ga.js";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(ga, s); s.parentNode.insertBefore(ga, s);
})(); })();
</script> </script>
</head> </head>
<body> <body>
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div> <div id="banner">
<header> <a href="https://github.com/danielkummer/git-flow-cheatsheet"
>Fork me on GitHub</a
>
</div>
<header>
<h1 id="title">git-flow cheatsheet</h1> <h1 id="title">git-flow cheatsheet</h1>
<p id="author"> <p id="author">
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> 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> <a
<script>!function (d, s, id) { href="https://twitter.com/share"
var js, fjs = d.getElementsByTagName(s)[0]; 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)) { if (!d.getElementById(id)) {
js = d.createElement(s); js = d.createElement(s);
js.id = id; js.id = id;
js.src = "//platform.twitter.com/widgets.js"; js.src = "//platform.twitter.com/widgets.js";
fjs.parentNode.insertBefore(js, fjs); fjs.parentNode.insertBefore(js, fjs);
} }
}(document, "script", "twitter-wjs");</script> })(document, "script", "twitter-wjs");
</script>
</p> </p>
<p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p> <p id="desc">
<p id="translations">translations: efficient branching using git-flow by
<a href="#" class="active" title="english">English</a> - <a href="http://nvie.com/">Vincent Driessen</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.es_ES.html" title="spanish">Castellano</a> -
<a href="index.pt_BR.html" title="Português Brasileiro">Português Brasileiro</a> - <a href="index.pt_BR.html" title="Português Brasileiro"
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - >Português Brasileiro</a
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - >
<a href="index.ja_JP.html" title="日本語">日本語</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.tr_TR.html" title="Turkce">Türkçe</a> -
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</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.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</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.de_DE.html" title="German">Deutsch (German)</a> -
<a href="index.ca_CA.html" title="Català">Català (Catalan)</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.ro_RO.html" title="Romanian">Română (Romanian)</a> -
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> - <a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
<a href="index.uk_UA.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.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
<a href="index.pl_PL.html" title="Polish">Polski</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.ar_MA.html" title="العربية">العربية</a> - <a href="index.ar_MA.html" title="العربية">العربية</a> -
<a href="index.fa_FA.html" title="فارسی">فارسی</a> - <a href="index.fa_FA.html" title="فارسی">فارسی</a> -
<a href="index.lt_LT.html" title="Lithuanian">Lietuviškai (Lithuanian)</a> - <a href="index.lt_LT.html" title="Lithuanian"
>Lietuviškai (Lithuanian)</a
>
-
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a> <a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a> <a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
</p> </p>
</header> </header>
<div id="main"> <div id="main">
<div class="scrollblock">
<div class="scrollblock">
<h2>About</h2> <h2>About</h2>
<p> <p>
git-flow are a set of git extensions to provide high-level repository operations for Vincent git-flow are a set of git extensions to provide high-level repository
Driessen's branching model. operations for Vincent Driessen's branching model.
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">more</a></small> <small
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
>more</a
></small
>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>This cheatsheet shows the basic usage and effect of git-flow operations</p> <p>
This cheatsheet shows the basic usage and effect of git-flow
operations
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Basic tips</h2> <h2>Basic tips</h2>
<ul> <ul>
<li>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li> <li>
<li>The macOS/Windows Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides Git flow provides excellent command line help and output. Read it
git-flow support carefully to see what's happening...
</li>
<li>
The macOS/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>
<li>Git-flow is a merge based solution. It doesn't rebase feature branches.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="setup" href="#setup">Setup</a></h2> <h2><a name="setup" href="#setup">Setup</a></h2>
<ul> <ul>
<li>You need a working git installation as prerequisite.</li> <li>You need a working git installation as prerequisite.</li>
@ -114,49 +172,53 @@
<div class="col-1"> <div class="col-1">
<h3>macOS</h3> <h3>macOS</h3>
<span>Homebrew</span> <span>Homebrew</span>
<blockquote> <blockquote>$ brew install git-flow-avh</blockquote>
$ brew install git-flow-avh
</blockquote>
<span>Macports</span> <span>Macports</span>
<blockquote> <blockquote>$ port install git-flow-avh</blockquote>
$ port install git-flow-avh
</blockquote>
<h3>Linux</h3> <h3>Linux</h3>
<blockquote> <blockquote>$ apt-get install git-flow</blockquote>
$ apt-get install git-flow
</blockquote>
<h3>Windows (Cygwin)</h3> <h3>Windows (Cygwin)</h3>
<blockquote> <blockquote>
$ wget -q -O - --no-check-certificate $ wget -q -O - --no-check-certificate
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
install stable | bash
</blockquote> </blockquote>
<p>You need wget and util-linux to install git-flow.</p> <p>You need wget and util-linux to install git-flow.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <p>
For detailed git flow installation instructions please visit the <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow For detailed git flow installation instructions please visit the
wiki</a>. <a
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
>git flow wiki</a
>.
</p> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow" />
</div>
</div> </div>
</div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">Getting started</a></h2> <h2>
<p>Git flow needs to be initialized in order to customize your project setup.</p> <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">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Initialize</h3> <h3>Initialize</h3>
<p>Start using git-flow by initializing it inside an existing git repository:</p>
<blockquote>
git flow init
</blockquote>
<p> <p>
You'll have to answer a few questions regarding the naming conventions for your branches.<br/> Start using git-flow by initializing it inside an existing git
repository:
</p>
<blockquote>git flow init</blockquote>
<p>
You'll have to answer a few questions regarding the naming
conventions for your branches.<br />
It's recommended to use the default values. It's recommended to use the default values.
</p> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="initialize"></div> <div class="initialize"></div>
@ -164,10 +226,9 @@
<div class="lines-open"></div> <div class="lines-open"></div>
<div class="lines-big"></div> <div class="lines-big"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="features" href="#features">Features</a></h2> <h2><a name="features" href="#features">Features</a></h2>
<ul class="narrow"> <ul class="narrow">
@ -180,10 +241,11 @@
<h3>Start a new feature</h3> <h3>Start a new feature</h3>
<p>Development of new features starting from the 'develop' branch.</p> <p>Development of new features starting from the 'develop' branch.</p>
<p>Start developing a new feature with</p> <p>Start developing a new feature with</p>
<blockquote> <blockquote>git flow feature start MYFEATURE</blockquote>
git flow feature start MYFEATURE <p>
</blockquote> This action creates a new feature branch based on 'develop' and
<p>This action creates a new feature branch based on 'develop' and switches to it</p> switches to it
</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -194,20 +256,19 @@
--> --></div>
</div>
<div class="col-2"> <div class="col-2">
<div class="feature-start"></div> <div class="feature-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish up a feature</h3> <h3>Finish up a feature</h3>
<p> <p>
Finish the development of a feature. Finish the development of a feature. This action performs the
This action performs the following following
</p> </p>
<ul> <ul>
<li>Merges MYFEATURE into 'develop'</li> <li>Merges MYFEATURE into 'develop'</li>
@ -215,206 +276,221 @@
<li>Switches back to 'develop' branch</li> <li>Switches back to 'develop' branch</li>
</ul> </ul>
<blockquote> <blockquote>git flow feature finish MYFEATURE</blockquote>
git flow feature finish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-end"></div> <div class="feature-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Publish a feature</h3> <h3>Publish a feature</h3>
<p> <p>
Are you developing a feature in collaboration? <br/> Are you developing a feature in collaboration? <br />
Publish a feature to the remote server so it can be used by other users. Publish a feature to the remote server so it can be used by other
users.
</p> </p>
<blockquote> <blockquote>git flow feature publish MYFEATURE</blockquote>
git flow feature publish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-publish"></div> <div class="feature-publish"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Getting a published feature</h3> <h3>Getting a published feature</h3>
<p> <p>Get a feature published by another user.</p>
Get a feature published by another user.
</p>
<blockquote> <blockquote>git flow feature pull origin MYFEATURE</blockquote>
git flow feature pull origin MYFEATURE
</blockquote>
<p> <p>You can track a feature on origin by using</p>
You can track a feature on origin by using
</p>
<blockquote>
git flow feature track MYFEATURE
</blockquote>
<blockquote>git flow feature track MYFEATURE</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="release" href="#release">Make a release</a></h2> <h2><a name="release" href="#release">Make a release</a></h2>
<ul> <ul>
<li>Support preparation of a new production release</li> <li>Support preparation of a new production release</li>
<li>Allow for minor bug fixes and preparing meta-data for a release</li> <li>
Allow for minor bug fixes and preparing meta-data for a release
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Start a release</h3> <h3>Start a release</h3>
<p>To start a release, use the git flow release command. It creates a release branch created from the 'develop' branch.</p> <p>
<blockquote> To start a release, use the git flow release command. It creates a
git flow release start RELEASE [BASE] release branch created from the 'develop' branch.
</blockquote> </p>
<p>You can optionally supply a <code>[BASE]</code> commit sha-1 hash to start the release from. The commit must <blockquote>git flow release start RELEASE [BASE]</blockquote>
be on the <p>
'develop' branch.</p> You can optionally supply a <code>[BASE]</code> commit sha-1 hash to
start the release from. The commit must be on the 'develop' branch.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>It's wise to publish the release branch after creating it to allow release commits by other developers. Do it similar to feature publishing with the command:</p> <p>
<blockquote> It's wise to publish the release branch after creating it to allow
git flow release publish RELEASE release commits by other developers. Do it similar to feature
</blockquote> publishing with the command:
<p>(You can track a remote release with the <br/><code>git flow release track RELEASE</code> command)</p> </p>
<blockquote>git flow release publish RELEASE</blockquote>
<p>
(You can track a remote release with the <br /><code
>git flow release track RELEASE</code
>
command)
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish up a release</h3> <h3>Finish up a release</h3>
<p>Finishing a release is one of the big steps in git branching. It performs several actions:</p> <p>
Finishing a release is one of the big steps in git branching. It
performs several actions:
</p>
<ul> <ul>
<li>Merges the release branch back into 'master'</li> <li>Merges the release branch back into 'master'</li>
<li>Tags the release with its name</li> <li>Tags the release with its name</li>
<li>Back-merges the release into 'develop'</li> <li>Back-merges the release into 'develop'</li>
<li>Removes the release branch</li> <li>Removes the release branch</li>
</ul> </ul>
<blockquote> <blockquote>git flow release finish RELEASE</blockquote>
git flow release finish RELEASE <p>
</blockquote> Don't forget to push your tags with
<p>Don't forget to push your tags with <code>git push origin --tags</code></p> <code>git push origin --tags</code>
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-end"></div> <div class="release-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2> <h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
<ul> <ul>
<li>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version <li>
Hotfixes arise from the necessity to act immediately upon an
undesired state of a live production version
</li>
<li>
May be branched off from the corresponding tag on the master branch
that marks the production version.
</li> </li>
<li>May be branched off from the corresponding tag on the master branch that marks the production version.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>git flow hotfix start</h3> <h3>git flow hotfix start</h3>
<p>Like the other git flow commands, a hotfix is started with</p> <p>Like the other git flow commands, a hotfix is started with</p>
<blockquote> <blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
git flow hotfix start VERSION [BASENAME] <p>
</blockquote> The version argument hereby marks the new hotfix release name.
<p>The version argument hereby marks the new hotfix release name. Optionally you can specify a basename to start from.</p> Optionally you can specify a basename to start from.
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish a hotfix</h3> <h3>Finish a hotfix</h3>
<p>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version.</p> <p>
<blockquote> By finishing a hotfix it gets merged back into develop and master.
git flow hotfix finish VERSION Additionally the master merge is tagged with the hotfix version.
</blockquote> </p>
<blockquote>git flow hotfix finish VERSION</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-end"></div> <div class="hotfix-end"></div>
</div> </div>
</div> </div>
<div> <div>
<div class="col-1"></div> <div class="col-1"></div>
<div class="col-2"> <div class="col-2">
<div class="lines-close"></div> <div class="lines-close"></div>
<div class="lines-small-end"></div> <div class="lines-small-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="commands" href="#commands">Commands</a></h2> <h2><a name="commands" href="#commands">Commands</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands" />
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Backlog</h2> <h2>Backlog</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Not all available commands are covered here, only the most important ones</li> <li>
<li>You can still use git and all its commands normally as you know them, git flow is only a tooling Not all available commands are covered here, only the most important
collection ones
</li>
<li>
You can still use git and all its commands normally as you know
them, git flow is only a tooling collection
</li> </li>
<li>The 'support' feature is still beta, using it is not advised</li> <li>The 'support' feature is still beta, using it is not advised</li>
<li>If you'd like to supply translations I'd be happy to integrate them</li> <li>
If you'd like to supply translations I'd be happy to integrate them
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
</div> </div>
<footer>
<footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Comments</a></h2> <h2><a name="comments" href="#comments">Comments</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>
</footer> </footer>
<script type="text/javascript"> <script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */ /* * * DON'T EDIT BELOW THIS LINE * * */
(function () { (function () {
var dsq = document.createElement('script'); var dsq = document.createElement("script");
dsq.type = 'text/javascript'; dsq.type = "text/javascript";
dsq.async = true; dsq.async = true;
dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js'; dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); (
document.getElementsByTagName("head")[0] ||
document.getElementsByTagName("body")[0]
).appendChild(dsq);
})(); })();
</script> </script>
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a> <noscript
</noscript> >Please enable JavaScript to view the
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a> <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
</noscript>
<a href="http://disqus.com" class="dsq-brlink"
</body> >comments powered by <span class="logo-disqus">Disqus</span></a
>
</body>
</html> </html>

550
index.hu_HU.html Normal file
View File

@ -0,0 +1,550 @@
<!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 puska</title>
<link
href="https://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 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"
>Forkolj GitHubon</a
>
</div>
<header>
<h1 id="title">git-flow puska</h1>
<p id="author">
készítette <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="author">
fordította
<a href="https://github.com/andrejmoltok" target="_blank"
>Ciocan Pál András</a
>
</p>
<p id="desc">
hatékony elágazások git-flow-val
<a href="http://nvie.com/">Vincent Driessen</a>-től
</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="Português Brasileiro"
>Português Brasileiro</a
>
-
<a href="index.zh_TW.html" title="Traditional Chinese"
>繁體中文(Hagyományos Kínai)</a
>
-
<a href="index.zh_CN.html" title="Simplified Chinese"
>简体中文(Egyszerűsített Kínai)</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="한국어">한국어(Koreai)</a> -
<a href="index.fr_FR.html" title="Français">Français</a> -
<a href="#" class="active" title="hungarian">Magyar(Hungarian)</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">Русский (Orosz)</a> -
<a href="index.de_DE.html" title="German">Deutsch (Német)</a> -
<a href="index.ca_CA.html" title="Català">Català (Katalán)</a> -
<a href="index.ro_RO.html" title="Romanian">Română (Román)</a> -
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Görög)</a>
-
<a href="index.uk_UA.html" title="Ukrainian">Українська (Ukrán)</a>
-
<a href="index.vi_VN.html" title="Tiếng Việt">Tiếng Việt (Vietnámi)</a>
- <a href="index.pl_PL.html" title="Polish">Polski</a> -
<a href="index.ar_MA.html" title="العربية">العربية(Arab)</a> -
<a href="index.fa_FA.html" title="فارسی">فارسی(Fárszi)</a> -
<a href="index.lt_LT.html" title="Lithuanian">Lietuviškai (Litván)</a>
-
<a href="index.az_AZ.html" title="Polish"
>Azərbaycanca (Azerbajdzsáni)</a
>
-
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
</p>
</header>
<div id="main">
<div class="scrollblock">
<h2>Rólam</h2>
<p>
A git-flow egy git kiterjesztések gyűjteménye, amely magas fokú
könyvtár műveleteket nyújt a Vincent Driessen-féle elágazási
modellhez.
<small
><a
href="http://nvie.com/posts/a-successful-git-branching-model/"
target="_blank"
>tovább</a
></small
>
</p>
<p class="divider">&#9733; &#9733; &#9733;</p>
<p>
Ez a puska a git-flow alap műveleteit és ezek következményeit mutatja
be.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p>
</div>
<div class="scrollblock">
<h2>Alap tippek</h2>
<ul>
<li>
A git-flow tökéletes parancssori segítséget és kimenetet nyújt.
Olvasd figyelmesen hogy lásd mit hogyan kell használni...
<small
><a href="https://www.npmjs.com/package/gitflow" target="_blank"
>tovább</a
></small
>
</li>
<li>
A
<a href="http://www.sourcetreeapp.com/">Sourcetree</a>, mint
macOS/Windows Kliens, illetve a
<a
href="https://gist.github.com/berkorbay/6feda478a00b0432d13f1fc0a50467f1"
>GitHub Desktop for Linux</a
>, mint Linux Kliens, mind kiváló git grafikus felület, amely
git-flow segédletet biztosíŧ
</li>
<li>
A Git-flow egy merge-alapú megoldás. Viszont, nem képes
rebase-elésre.
</li>
</ul>
<p class="divider">&#9733; &#9733; &#9733;</p>
</div>
<div class="scrollblock">
<h2><a name="setup" href="#setup">Telepítés</a></h2>
<ul>
<li>Előfeltételként szükséges egy működő git telepítés.</li>
<li>A Git-flow macOS-on, Linux-on és Windows-on működik.</li>
</ul>
<p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1">
<h3>macOS</h3>
h3>
<span>Homebrew</span>
<blockquote>$ brew install git-flow</blockquote>
<span>Macportolások</span>
<blockquote>$ port install git-flow</blockquote>
<span
><a
href="https://github.com/nvie/gitflow/wiki/Mac-OS-X"
target="_blank"
>tovább</a
></span
>
<h3>Linux</h3>
<blockquote>$ npm i -g gitflow</blockquote>
<span
><a
href="https://github.com/nvie/gitflow/wiki/Linux"
target="_blank"
>tovább</a
></span
>
<h3>Windows (Cygwin)</h3>
<blockquote>
$ $ wget -q -O - --no-check-certificate
https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh
| bash
</blockquote>
<span
><a
href="https://github.com/nvie/gitflow/wiki/Windows"
target="_blank"
>tovább</a
></span
>
<p>
Először telepítsd a wget-et, majd az util-linuxot a git-flow-hoz.
</p>
</div>
<div class="col-2">
<p>
Részletes git-flow telepítési útmutatóért látogass el a
<a
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
>git flow wiki</a
>-re.
</p>
<img src="img/download.png" alt="install git-flow" />
</div>
</div>
<div class="scrollblock">
<h2>
<a name="getting_started" href="#getting_started">Vágjunk bele</a>
</h2>
<p>
A Git-flow-t először is inicializálni kell hogy személyre szabhasd a
projektedet.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1">
<h3>Inicilizálás</h3>
<p>
Az inicializálást egy, már létező git könyvtárban(repo-ban) kell
elkezdeni, az alábbi paranccsal:
</p>
<blockquote>git flow init</blockquote>
<p>
Néhány kérdést fog feltenni a branch-eid elnevezési szabványaira
való tekintettel.<br />
Ajánlott az alap értékekkel menni.
</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-ök</a></h2>
<ul class="narrow">
<li>Fejlessz új feature-őket a leendő kiadásokhoz</li>
<li>Ez jellemzően csak a fejlesztők repo-iban vannak</li>
</ul>
<p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1">
<h3>Új feature elindítása</h3>
<p>Új feature-ok fejlesztése a `develop` branchből indul.</p>
<p>A következő parancsot használd ehhez</p>
<blockquote>git flow feature start MYFEATURE</blockquote>
<p>
Ez a parancs új feature branch-et készít a `develop`-ba majd
automatikusan átvált(checkout) arra a branch-re.
</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>Új feature befejezése</h3>
<p>
Új feature fejlesztésének befejezése. Ez a parancs a következőket
csinálja
</p>
<ul>
<li>Merge-eli a MYFEATURE-t a 'develop' branchbe</li>
<li>Eltávolítja a feature branch-et</li>
<li>Visszalép a 'develop' branch-be</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>Új feature kiadása</h3>
<p>
Csapatban fejlesztessz új feature-t? <br />
Publikáld az új feature-t a távoli szerverre, hogy más felhasználók
is használni tudják.
</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>Kiadott feature beszerzése</h3>
<p>Mások által publikált feature-okat így szerezhetsz be.</p>
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
<p>Követheted a feature-t az origin-ből a következőképpen</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">Kiadás lérehozása</a></h2>
<ul>
<li>Támogatja új production release előkészítését</li>
<li>
Megengedi új kiadásnak(release) bug-fixeit és metadata
előkészítését.
</li>
</ul>
<p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1">
<h3>Kiadás elindítása</h3>
<p>
Új kiadás(release) létrehozásához, használd a `git flow release`
parancsot. Ez készít egy release branch-et, amelyet a `develop`
branch-ből ered.
</p>
<blockquote>git flow release start RELEASE [BASE]</blockquote>
<p>
Tetszőlgesen csatolhatsz egy <code>[BASE]</code> commit sha-1 hash-t
új kiadás elindításához. A megadott commit a `develop` branch-ből
kell származnia.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p>
<p>
Bölcs dolog kiadási branch publikálása létrehozás után, mivel más
fejlesztők is adhatnak hozzá kiadási commitokat. Hasonlóképpen a
feature publikáláshoz, használd az alábbi parancsot:
</p>
<blockquote>git flow release publish RELEASE</blockquote>
<p>
(Követheted is a távoli kiadás-t ezzel a <br /><code
>git flow release track RELEASE</code
>
paranccsal)
</p>
</div>
<div class="col-2">
<div class="release-start"></div>
</div>
</div>
<div class="scrollblock">
<div class="col-1">
<h3>Kiadás lezárása</h3>
<p>
Egy kiadás lezárása a legnagyobb lépés a git elágazásban. A alábbi
parancsok futnak le:
</p>
<ul>
<li>
Egyesíti(Merge) a kiadási(release) branch-et a `master` branch-el
</li>
<li>Hozzáadja a kiadás nevét Tag-ként a kiadáshoz</li>
<li>
Visszafelé egyesíti a kiadási branch-et a `develop` branch-be
</li>
<li>Eltávolítja a kiadási(release) branch-et</li>
</ul>
<blockquote>git flow release finish RELEASE</blockquote>
<p>
Ne feledd a tag-eket is push-olni
<code>git push origin --tags</code>
</p>
</div>
<div class="col-2">
<div class="release-end"></div>
</div>
</div>
<div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">Hotfixek</a></h2>
<ul>
<li>
Hotfixekre akkor van szükség, amikor egy nemkívánatos állapot áll
fenn egy production verzióban.
</li>
<li>
Elágazhatnak a hozzátartózó tag-ből a master branch-en, amely a
production verziót jelőli.
</li>
</ul>
<p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1">
<h3>git flow hotfix start</h3>
<p>
Hasonlóképpen más git-flow parancsokhoz, egy hotfix elindításához
futtasd az alábbi parancsot.
</p>
<blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
<p>
A verzió argumentum az új hotfix kiadási nevét jelenti.
Tetszőlegesen megjelölhetsz egy kiindulási nevet is.
</p>
</div>
<div class="col-2">
<div class="hotfix-start"></div>
</div>
</div>
<div class="scrollblock">
<div class="col-1">
<h3>Hotfix lezárása(finish)</h3>
<p>
Egy hotfix lezárása után, automatikusan egyesítve lesz mind a
develop, mind a master banch-ekkel. Továbbá a master branch,
egyesítés után, a hotfix verziójával lesz tag-elve.
</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">Parancsok</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands" />
</div>
<div class="scrollblock">
<h2>Backlog</h2>
<p class="divider">&#9733; &#9733; &#9733;</p>
<ul>
<li>
Nincs mindegyik parancs felsorolva itt, csupán a legfontosabbak
</li>
<li>
Továbbra is használhatod a git-et és az összes parancsait, ahogy
eddig, a git-flow mindössze a eszköz kollekció.
</li>
<li>
A 'support'(támogatás) feature még beta verzióban van, használata
nem ajánlott.
</li>
<li>Ha a honosításban szeretnél segíteni, akkor forkold GitHubon</li>
</ul>
<p class="divider">&#9733; &#9733; &#9733;</p>
</div>
</div>
<footer>
<div class="scrollblock">
<h2><a name="comments" href="#comments">Kommentek</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 = "https://" + 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>

1
index.id_ID.html
View File

@ -55,6 +55,7 @@
<a href="index.tr_TR.html" title="Turkce">Türkçe</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.ko_KR.html" title="한국어">한국어(Korean)</a> -
<a href="index.fr_FR.html" title="Français">Français</a> - <a href="index.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> - <a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -

456
index.it_IT.html
View File

@ -1,159 +1,225 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns="http://www.w3.org/1999/html"> <html lang="en" xmlns="http://www.w3.org/1999/html">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>git-flow cheatsheet</title> <title>git-flow cheatsheet</title>
<link href='https://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'> <link
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print"> href="https://fonts.googleapis.com/css?family=Sansita+One"
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print"> 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 type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-33766650-1']); _gaq.push(["_setAccount", "UA-33766650-1"]);
_gaq.push(['_trackPageview']); _gaq.push(["_trackPageview"]);
(function () { (function () {
var ga = document.createElement('script'); var ga = document.createElement("script");
ga.type = 'text/javascript'; ga.type = "text/javascript";
ga.async = true; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; ga.src =
var s = document.getElementsByTagName('script')[0]; ("https:" == document.location.protocol
? "https://ssl"
: "http://www") + ".google-analytics.com/ga.js";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(ga, s); s.parentNode.insertBefore(ga, s);
})(); })();
</script> </script>
</head> </head>
<body> <body>
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork su GitHub</a></div> <div id="banner">
<header> <a href="https://github.com/danielkummer/git-flow-cheatsheet"
>Fork su GitHub</a
>
</div>
<header>
<h1 id="title">git-flow cheatsheet</h1> <h1 id="title">git-flow cheatsheet</h1>
<p id="author"> <p id="author">
creato da <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> 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> <a
<script>!function (d, s, id) { href="https://twitter.com/share"
var js, fjs = d.getElementsByTagName(s)[0]; 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)) { if (!d.getElementById(id)) {
js = d.createElement(s); js = d.createElement(s);
js.id = id; js.id = id;
js.src = "//platform.twitter.com/widgets.js"; js.src = "//platform.twitter.com/widgets.js";
fjs.parentNode.insertBefore(js, fjs); fjs.parentNode.insertBefore(js, fjs);
} }
}(document, "script", "twitter-wjs");</script> })(document, "script", "twitter-wjs");
</script>
</p> </p>
<p id="desc">branching efficiente usando git-flow realizzato da <a href="http://nvie.com/">Vincent Driessen</a></p> <p id="desc">
<p id="translations">traduzioni: branching efficiente usando git-flow realizzato da
<a href="index.html" title="english">English</a> - <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.es_ES.html" title="spanish">Castellano</a> -
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> - <a href="index.pt_BR.html" title="Brazilian Portugues"
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - >Brazilian Portugues</a
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - >
<a href="index.ja_JP.html" title="日本語">日本語</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.tr_TR.html" title="Turkce">Türkçe</a> -
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</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.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="#" title="Italiano" class="active">Italiano</a> - <a href="#" title="Italiano" class="active">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</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.de_DE.html" title="German">Deutsch (German)</a> -
<a href="index.ca_CA.html" title="Català">Català (Catalan)</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.ro_RO.html" title="Romanian">Română (Romanian)</a> -
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> - <a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
<a href="index.uk_UA.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.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
<a href="index.pl_PL.html" title="Polish">Polski</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.ar_MA.html" title="العربية">العربية</a> - <a href="index.ar_MA.html" title="العربية">العربية</a> -
<a href="index.fa_FA.html" title="فارسی">فارسی</a> - <a href="index.fa_FA.html" title="فارسی">فارسی</a> -
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a> <a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a> <a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
</p> </p>
</header> </header>
<div id="main"> <div id="main">
<div class="scrollblock">
<div class="scrollblock">
<h2>Introduzione</h2> <h2>Introduzione</h2>
<p> <p>
git-flow è un set di estensioni per git che offre comandi di alto livello sul repository per utilizzare il modello di branching di Vincent git-flow è un set di estensioni per git che offre comandi di alto
Driessen. livello sul repository per utilizzare il modello di branching di
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">maggiori informazioni</a></small> Vincent Driessen.
<small
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
>maggiori informazioni</a
></small
>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>Questo cheatsheet mostra l'utilizzo di base a gli effetti dei comandi offerti da git-flow</p> <p>
Questo cheatsheet mostra l'utilizzo di base a gli effetti dei comandi
offerti da git-flow
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Consigli di base</h2> <h2>Consigli di base</h2>
<ul> <ul>
<li>Git flow offre un eccelente guida e un ottimo output a linea di comando. Leggeteli attentamente per vedere e capire cosa sta succedendo...</li> <li>
<li>Il Client per macOS/Windows <a href="http://www.sourcetreeapp.com/">Sourcetree</a> è un'eccellente GUI per git e offre supporto per git-flow Git flow offre un eccelente guida e un ottimo output a linea di
comando. Leggeteli attentamente per vedere e capire cosa sta
succedendo...
</li>
<li>
Il Client per macOS/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 alcun rebase
sui feature branch.
</li> </li>
<li>Git-flow è una soluzione basata sul merge. Non esegue alcun rebase sui feature branch.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="setup" href="#setup">Setup</a></h2> <h2><a name="setup" href="#setup">Setup</a></h2>
<ul> <ul>
<li>È necessaria un'installazione di git funzionante come prerequisito.</li> <li>
È necessaria un'installazione di git funzionante come prerequisito.
</li>
<li>Git flow funziona su macOS, Linux e Windows</li> <li>Git flow funziona su macOS, Linux e Windows</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>macOS</h3> <h3>macOS</h3>
<span>Homebrew</span> <span>Homebrew</span>
<blockquote> <blockquote>$ brew install git-flow-avh</blockquote>
$ brew install git-flow-avh
</blockquote>
<span>Macports</span> <span>Macports</span>
<blockquote> <blockquote>$ port install git-flow-avh</blockquote>
$ port install git-flow-avh
</blockquote>
<h3>Linux</h3> <h3>Linux</h3>
<blockquote> <blockquote>$ apt-get install git-flow</blockquote>
$ apt-get install git-flow
</blockquote>
<h3>Windows (Cygwin)</h3> <h3>Windows (Cygwin)</h3>
<blockquote> <blockquote>
$ wget -q -O - --no-check-certificate $ wget -q -O - --no-check-certificate
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
install stable | bash
</blockquote> </blockquote>
<p>Sono necessari wget e util-linux per installare git-flow.</p> <p>Sono necessari wget e util-linux per installare git-flow.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <p>
Per le istruzioni dettagliate riguardo all'installazione di git-flow visitate il <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">wiki di git flow</a>. Per le istruzioni dettagliate riguardo all'installazione di git-flow
visitate il
<a
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
>wiki di git flow</a
>.
</p> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow" />
</div>
</div> </div>
</div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">Per Iniziare</a></h2> <h2>
<p>Git flow ha la necessità di essere inizializzato onde personalizzare il setup del progetto.</p> <a name="getting_started" href="#getting_started">Per Iniziare</a>
</h2>
<p>
Git flow ha la necessità di essere inizializzato onde personalizzare
il setup del progetto.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Inizializzazione</h3> <h3>Inizializzazione</h3>
<p>&#232; possibile iniziare ad utilizzare git-flow inizializzandolo all'interno di un repository git esistente:</p>
<blockquote>
git flow init
</blockquote>
<p> <p>
Dovrete rispondere ad alcune domande riguardanti la naming conventions da utilizzarsi per i branch.<br/> &#232; possibile iniziare 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 da utilizzarsi per i branch.<br />
Si consglia l'uso dei valori di default proposti. Si consglia l'uso dei valori di default proposti.
</p> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="initialize"></div> <div class="initialize"></div>
@ -161,15 +227,16 @@
<div class="lines-open"></div> <div class="lines-open"></div>
<div class="lines-big"></div> <div class="lines-big"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="features" href="#features">Features (Funzionalità)</a></h2> <h2><a name="features" href="#features">Features (Funzionalità)</a></h2>
<ul class="narrow"> <ul class="narrow">
<li>Sviluppare nuove features per le releases in arrivo</li> <li>Sviluppare nuove features per le releases in arrivo</li>
<li>Generalmente sono (branch) presenti solo nei repository di sviluppo</li> <li>
Generalmente sono (branch) presenti solo nei repository di sviluppo
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
@ -177,10 +244,11 @@
<h3>Iniziare una nuova feature</h3> <h3>Iniziare una nuova feature</h3>
<p>Lo sviluppo di nuove feature comincia dal branch 'develop'.</p> <p>Lo sviluppo di nuove feature comincia dal branch 'develop'.</p>
<p>Iniziate lo sviluppo di una nuova feature con</p> <p>Iniziate lo sviluppo di una nuova feature con</p>
<blockquote> <blockquote>git flow feature start MYFEATURE</blockquote>
git flow feature start MYFEATURE <p>
</blockquote> Questa crea un nuovo feature branch basato su 'develop' e si sposta
<p>Questa crea un nuovo feature branch basato su 'develop' e si sposta su quello (ne fa il checkout)</p> su quello (ne fa il checkout)
</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -191,217 +259,257 @@
--> --></div>
</div>
<div class="col-2"> <div class="col-2">
<div class="feature-start"></div> <div class="feature-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Completamento di una feature</h3> <h3>Completamento di una feature</h3>
<p> <p>
Termina lo sviluppo di una feature. Termina lo sviluppo di una feature. Questa azione esegue le seguenti
Questa azione esegue le seguenti operazioni operazioni
</p> </p>
<ul> <ul>
<li>Merge del branch MYFEATURE nel branch 'develop'</li> <li>Merge del branch MYFEATURE nel branch 'develop'</li>
<li>Rimuove il feature branch usato per lo sviluppo della feature</li> <li>
Rimuove il feature branch usato per lo sviluppo della feature
</li>
<li>Si sposta di nuovo sul branch 'develop'</li> <li>Si sposta di nuovo sul branch 'develop'</li>
</ul> </ul>
<blockquote> <blockquote>git flow feature finish MYFEATURE</blockquote>
git flow feature finish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-end"></div> <div class="feature-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Pubblicare una feature</h3> <h3>Pubblicare una feature</h3>
<p> <p>
State sviluppando una feature in collaborazione con altri?<br/> State sviluppando una feature in collaborazione con altri?<br />
Pubblicate una feature sul server remoto in modo che possa essere utilizzata da altri utenti. Pubblicate una feature sul server remoto in modo che possa essere
utilizzata da altri utenti.
</p> </p>
<blockquote> <blockquote>git flow feature publish MYFEATURE</blockquote>
git flow feature publish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-publish"></div> <div class="feature-publish"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Scaricare una feature pubblicata</h3> <h3>Scaricare una feature pubblicata</h3>
<p> <p>
Scaricare dal server remoto una feature pubblicata da un altro utente. Scaricare dal server remoto una feature pubblicata da un altro
utente.
</p> </p>
<blockquote> <blockquote>git flow feature pull origin MYFEATURE</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> <p>
Potete tracciare una feature sul repository origin usando
<code> git flow feature track MYFEATURE</code>
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="release" href="#release">Creare una release</a></h2> <h2><a name="release" href="#release">Creare una release</a></h2>
<ul> <ul>
<li>Supporto alla preparazione di una nuova release di produzione</li> <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> <li>
Consente di eseguire bug fixes minori e preparare i meta-dati per la
release
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Iniziare una release</h3> <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>
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 facoltativamente fornire nel parametro <code>[BASE]</code> lo
sha-1 hash del commit dal quale far partire la release. Il commit
deve essere presente nel branch 'develop'.
</p> </p>
<blockquote>
git flow release start RELEASE [BASE]
</blockquote>
<p>Potere facoltativamente fornire nel parametro <code>[BASE]</code> lo sha-1 hash del commit dal quale far partire la release. Il commit deve essere presente nel branch 'develop'.</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</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 usato per pubblicare le features:</p> <p>
<blockquote> È una buona idea pubblicare il release branch dopo averlo creato in
git flow release publish RELEASE modo da consentire l'invio di release commit anche da parte di altri
</blockquote> sviluppatori. Potete farlo, usando un comando analogo a quello usato
<p>(Potete tracciare la release remota con il comando <code>git flow release track RELEASE</code>)</p> per pubblicare le features:
</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>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Completamento di una release</h3> <h3>Completamento di una release</h3>
<p>Terminare una release è uno dei passi più grandi nella gestione dei branch di git. Vengono eseguite svariate operazioni:</p> <p>
Terminare una release è uno dei passi più grandi nella gestione dei
branch di git. Vengono eseguite svariate operazioni:
</p>
<ul> <ul>
<li>Merge del release branch su branch 'master'</li> <li>Merge del release branch su branch 'master'</li>
<li>Tagging della relase con il suo nome</li> <li>Tagging della relase con il suo nome</li>
<li>Merge all'indietro della relase sul branch 'develop'</li> <li>Merge all'indietro della relase sul branch 'develop'</li>
<li>Rimozione del release branch</li> <li>Rimozione del release branch</li>
</ul> </ul>
<blockquote> <blockquote>git flow release finish RELEASE</blockquote>
git flow release finish RELEASE <p>
</blockquote> Non dimenticate di fare il push dei tag creati con
<p>Non dimenticate di fare il push dei tag creati con <code>git push --tags</code></p> <code>git push --tags</code>
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-end"></div> <div class="release-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2> <h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
<ul> <ul>
<li>Gli Hotfixes nascono dalla necessità di reagire prontamente di fronte ad uno stato indesiderato della versione live di produzione.</li> <li>
<li>Possono essere creati a partire dal tag corrispondente sul branch master che contrassegna la versione di produzione.</li> Gli Hotfixes nascono dalla necessità di reagire prontamente di
fronte ad uno stato indesiderato della versione live di produzione.
</li>
<li>
Possono essere creati a partire dal tag corrispondente sul branch
master che contrassegna la versione di produzione.
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>git flow hotfix start</h3> <h3>git flow hotfix start</h3>
<p>Come gli altri comandi di git flow, un hotfix si inizia con</p> <p>Come gli altri comandi di git flow, un hotfix si inizia con</p>
<blockquote> <blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
git flow hotfix start VERSION [BASENAME] <p>
</blockquote> La versione passata come argomento definisce il nuovo nome
<p>La versione passata come argomento definisce il nuovo nome dell'hotfix release. Facoltativamente potete specificare un basename da cui partire (un tag di release sul branch 'master').</p> dell'hotfix release. Facoltativamente potete specificare un basename
da cui partire (un tag di release sul branch 'master').
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>completamento di un hotfix</h3> <h3>completamento di un hotfix</h3>
<p>Terminando un hotfix, questo viene integrato (merge) all'indietro all'interno dei branch 'develop' e 'master'. In aggiunta il master viene taggato con la versone dell'hotfix.</p> <p>
<blockquote> Terminando un hotfix, questo viene integrato (merge) all'indietro
git flow hotfix finish VERSION all'interno dei branch 'develop' e 'master'. In aggiunta il master
</blockquote> viene taggato con la versone dell'hotfix.
</p>
<blockquote>git flow hotfix finish VERSION</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-end"></div> <div class="hotfix-end"></div>
</div> </div>
</div> </div>
<div> <div>
<div class="col-1"></div> <div class="col-1"></div>
<div class="col-2"> <div class="col-2">
<div class="lines-close"></div> <div class="lines-close"></div>
<div class="lines-small-end"></div> <div class="lines-small-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="commands" href="#commands">Comandi</a></h2> <h2><a name="commands" href="#commands">Comandi</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands" />
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Backlog</h2> <h2>Backlog</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Non tutti i comandi git disponibili sono riportati qui, solo quelli più importanti</li> <li>
<li>Potete comunque sempre usare git e tutti i suoi comandi normalmente come li conoscete, git flow costituisce solamente una collezione di strumenti aggiuntivi. Non tutti i comandi git disponibili sono riportati qui, solo quelli
più importanti
</li>
<li>
Potete comunque sempre usare git e tutti i suoi comandi normalmente
come li conoscete, git flow costituisce solamente una collezione di
strumenti aggiuntivi.
</li>
<li>
La funzionalità 'support' è ancora in beta, il suo utilizzo non è
consigliato
</li>
<li>
Se volete fornire una traduzione nella Vostra lingua, sarò felice di
integrarla
</li> </li>
<li>La funzionalità 'support' è ancora in beta, il suo utilizzo non è consigliato</li>
<li>Se volete fornire una traduzione nella Vostra lingua, sarò felice di integrarla</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
</div> </div>
<footer>
<footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Commenti</a></h2> <h2><a name="comments" href="#comments">Commenti</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>
</footer> </footer>
<script type="text/javascript"> <script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */ /* * * DON'T EDIT BELOW THIS LINE * * */
(function () { (function () {
var dsq = document.createElement('script'); var dsq = document.createElement("script");
dsq.type = 'text/javascript'; dsq.type = "text/javascript";
dsq.async = true; dsq.async = true;
dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js'; dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); (
document.getElementsByTagName("head")[0] ||
document.getElementsByTagName("body")[0]
).appendChild(dsq);
})(); })();
</script> </script>
<noscript>Prego abilitare JavaScript per visualizzare i <a href="http://disqus.com/?ref_noscript">commenti (powered by Disqus.)</a> <noscript
</noscript> >Prego abilitare JavaScript per visualizzare i
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a> <a href="http://disqus.com/?ref_noscript"
>commenti (powered by Disqus.)</a
>
</body> </noscript>
<a href="http://disqus.com" class="dsq-brlink"
>comments powered by <span class="logo-disqus">Disqus</span></a
>
</body>
</html> </html>

1
index.ja_JP.html
View File

@ -55,6 +55,7 @@
<a href="index.tr_TR.html" title="Turkce">Türkçe</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.ko_KR.html" title="한국어">한국어(Korean)</a> -
<a href="index.fr_FR.html" title="Français">Français</a> - <a href="index.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> - <a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -

391
index.ko_KR.html
View File

@ -1,94 +1,155 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns="http://www.w3.org/1999/html"> <html lang="en" xmlns="http://www.w3.org/1999/html">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>git-flow cheatsheet</title> <title>git-flow cheatsheet</title>
<link href='https://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'> <link
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print"> href="https://fonts.googleapis.com/css?family=Sansita+One"
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print"> 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 type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-33766650-1']); _gaq.push(["_setAccount", "UA-33766650-1"]);
_gaq.push(['_trackPageview']); _gaq.push(["_trackPageview"]);
(function () { (function () {
var ga = document.createElement('script'); var ga = document.createElement("script");
ga.type = 'text/javascript'; ga.type = "text/javascript";
ga.async = true; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; ga.src =
var s = document.getElementsByTagName('script')[0]; ("https:" == document.location.protocol
? "https://ssl"
: "http://www") + ".google-analytics.com/ga.js";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(ga, s); s.parentNode.insertBefore(ga, s);
})(); })();
</script> </script>
</head> </head>
<body> <body>
<div id="banner"> <div id="banner">
<a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a> <a href="https://github.com/danielkummer/git-flow-cheatsheet"
</div> >Fork me on GitHub</a
<header> >
</div>
<header>
<h1 id="title">git-flow cheatsheet</h1> <h1 id="title">git-flow cheatsheet</h1>
<p id="author"> <p id="author">
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> 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> <a
<script>!function (d, s, id) { href="https://twitter.com/share"
var js, fjs = d.getElementsByTagName(s)[0]; 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)) { if (!d.getElementById(id)) {
js = d.createElement(s); js = d.createElement(s);
js.id = id; js.id = id;
js.src = "//platform.twitter.com/widgets.js"; js.src = "//platform.twitter.com/widgets.js";
fjs.parentNode.insertBefore(js, fjs); fjs.parentNode.insertBefore(js, fjs);
} }
}(document, "script", "twitter-wjs");</script> })(document, "script", "twitter-wjs");
</script>
</p> </p>
<p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p> <p id="desc">
<p id="translations">translations: efficient branching using git-flow by
<a href="index.html" title="english">English</a> - <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.es_ES.html" title="spanish">Castellano</a> -
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> - <a href="index.pt_BR.html" title="Brazilian Portugues"
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - >Brazilian Portugues</a
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - >
<a href="index.ja_JP.html" title="日本語">日本語</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.tr_TR.html" title="Turkce">Türkçe</a> -
<a href="#" class="active" title="한국어">한국어(Korean)</a> - <a href="#" class="active" title="한국어">한국어(Korean)</a> -
<a href="index.fr_FR.html" title="Français">Français</a> - <a href="index.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</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.de_DE.html" title="German">Deutsch (German)</a> -
<a href="index.ca_CA.html" title="Català">Català (Catalan)</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.ro_RO.html" title="Romanian">Română (Romanian)</a> -
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> - <a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
<a href="index.uk_UA.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.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
<a href="index.pl_PL.html" title="Polish">Polski</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.ar_MA.html" title="العربية">العربية</a> - <a href="index.ar_MA.html" title="العربية">العربية</a> -
<a href="index.fa_FA.html" title="فارسی">فارسی</a> - <a href="index.fa_FA.html" title="فارسی">فارسی</a> -
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a> <a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a> <a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
</p> </p>
</header> </header>
<div id="main"> <div id="main">
<div class="scrollblock"> <div class="scrollblock">
<h2>About</h2> <h2>About</h2>
<p> <p>
git-flow는 Vincent Driessen의 브랜칭 모델을 위한 고수준 저장소 작업을 제공하는 git의 확장입니다. git-flow는 Vincent Driessen의 브랜칭 모델을 위한 고수준 저장소 작업을
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">more</a></small> 제공하는 git의 확장입니다.
<small
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
>more</a
></small
>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>이 치트 시트는 기본적인 사용법과 git-flow 작업의 효과를 보여줍니다.</p> <p>
이 치트 시트는 기본적인 사용법과 git-flow 작업의 효과를 보여줍니다.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Basic tips</h2> <h2>Basic tips</h2>
<ul> <ul>
<li>Git flow는 훌륭한 명령행 도움말과 출력을 제공합니다. 무슨 일이 일어나는지를 알려면 출력을 주의깊게 읽어주세요.</li> <li>
<li>macOS/Window Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a>는 훌륭한 git gui를 제공하고 git-flow에 대한 지원을 제공합니다.</li> Git flow는 훌륭한 명령행 도움말과 출력을 제공합니다. 무슨 일이
<li>Git-flow는 병합(merge) 기반의 솔루션입니다. feature 브랜치를 리베이스(rebase)하지 않습니다.</li> 일어나는지를 알려면 출력을 주의깊게 읽어주세요.
</li>
<li>
macOS/Window Client
<a href="http://www.sourcetreeapp.com/">Sourcetree</a>는 훌륭한 git
gui를 제공하고 git-flow에 대한 지원을 제공합니다.
</li>
<li>
Git-flow는 병합(merge) 기반의 솔루션입니다. feature 브랜치를
리베이스(rebase)하지 않습니다.
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="setup" href="#setup">Setup</a></h2> <h2><a name="setup" href="#setup">Setup</a></h2>
<ul> <ul>
<li>사전에 제대로 동작하는 git이 설치되어 있어야합니다.</li> <li>사전에 제대로 동작하는 git이 설치되어 있어야합니다.</li>
@ -98,44 +159,46 @@
<div class="col-1"> <div class="col-1">
<h3>macOS</h3> <h3>macOS</h3>
<span>Homebrew</span> <span>Homebrew</span>
<blockquote> <blockquote>$ brew install git-flow-avh</blockquote>
$ brew install git-flow-avh
</blockquote>
<span>Macports</span> <span>Macports</span>
<blockquote> <blockquote>$ port install git-flow-avh</blockquote>
$ port install git-flow-avh
</blockquote>
<h3>Linux</h3> <h3>Linux</h3>
<blockquote> <blockquote>$ apt-get install git-flow</blockquote>
$ apt-get install git-flow
</blockquote>
<h3>Windows (Cygwin)</h3> <h3>Windows (Cygwin)</h3>
<blockquote> <blockquote>
$ wget -q -O - --no-check-certificate $ wget -q -O - --no-check-certificate
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
install stable | bash
</blockquote> </blockquote>
<p>git-flow의 설치를 위해서는 wget과 util-linux가 필요합니다.</p> <p>git-flow의 설치를 위해서는 wget과 util-linux가 필요합니다.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <p>
상세한 git flow의 설치 방법은 <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow wiki</a>를 참고하세요. 상세한 git flow의 설치 방법은
<a
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
>git flow wiki</a
>를 참고하세요.
</p> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow" />
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">Getting started</a></h2> <h2>
<a name="getting_started" href="#getting_started">Getting started</a>
</h2>
<p>Git flow는 프로젝트 설정을 변경하기 위해 초기화를 필요로 합니다.</p> <p>Git flow는 프로젝트 설정을 변경하기 위해 초기화를 필요로 합니다.</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>초기화</h3> <h3>초기화</h3>
<p>기존 git 저장소 내에서 초기화하는 것으로 git-flow의 사용을 시작합니다.</p>
<blockquote>
git flow init
</blockquote>
<p> <p>
몇몇 질문에 대답해서 브랜치의 명명규칙을 정합니다. 기존 git 저장소 내에서 초기화하는 것으로 git-flow의 사용을
기본 값을 사용하기를 권장합니다. 시작합니다.
</p>
<blockquote>git flow init</blockquote>
<p>
몇몇 질문에 대답해서 브랜치의 명명규칙을 정합니다. 기본 값을
사용하기를 권장합니다.
</p> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
@ -144,8 +207,8 @@
<div class="lines-open"></div> <div class="lines-open"></div>
<div class="lines-big"></div> <div class="lines-big"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="features" href="#features">Features</a></h2> <h2><a name="features" href="#features">Features</a></h2>
<ul class="narrow"> <ul class="narrow">
<li>다가오는 배포(release)를 위한 새 기능(feature)을 개발합니다.</li> <li>다가오는 배포(release)를 위한 새 기능(feature)을 개발합니다.</li>
@ -156,191 +219,215 @@
<h3>새 기능(feature) 시작하기</h3> <h3>새 기능(feature) 시작하기</h3>
<p>새 기능의 개발은 'develop' 브랜치에서 시작합니다.</p> <p>새 기능의 개발은 'develop' 브랜치에서 시작합니다.</p>
<p>다음과 같이 새 기능의 개발을 시작합니다.</p> <p>다음과 같이 새 기능의 개발을 시작합니다.</p>
<blockquote> <blockquote>git flow feature start MYFEATURE</blockquote>
git flow feature start MYFEATURE <p>
</blockquote> 이것은 'develop'에 기반한 새 기능(feature) 브랜치를 생성하고 그
<p>이것은 'develop'에 기반한 새 기능(feature) 브랜치를 생성하고 그 브랜치로 전환합니다.</p> 브랜치로 전환합니다.
</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
- Start committing last-minute fixes in preparing your release - Start committing last-minute fixes in preparing your release
- When done, run: - When done, run:
git flow release finish 'testrelease' git flow release finish 'testrelease'
--> --></div>
</div>
<div class="col-2"> <div class="col-2">
<div class="feature-start"></div> <div class="feature-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>기능 완료</h3> <h3>기능 완료</h3>
<p> <p>기능 개발을 완료합니다. 이것은 다음 작업들을 수행합니다.</p>
기능 개발을 완료합니다.
이것은 다음 작업들을 수행합니다.
</p>
<ul> <ul>
<li>MYFEATURE 브랜치를 'develop'에 병합(merge)합니다.</li> <li>MYFEATURE 브랜치를 'develop'에 병합(merge)합니다.</li>
<li>기능 브랜치를 삭제합니다.</li> <li>기능 브랜치를 삭제합니다.</li>
<li>'develop' 브랜치로 전환합니다.</li> <li>'develop' 브랜치로 전환합니다.</li>
</ul> </ul>
<blockquote> <blockquote>git flow feature finish MYFEATURE</blockquote>
git flow feature finish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-end"></div> <div class="feature-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>기능을 게시(publish)</h3> <h3>기능을 게시(publish)</h3>
<p> <p>
기능을 공동으로 개발하고 있나요? <br/> 기능을 공동으로 개발하고 있나요? <br />
기능을 원격 서버에 게시하여 다른 사용자들도 사용할 수 있게 합니다. 기능을 원격 서버에 게시하여 다른 사용자들도 사용할 수 있게 합니다.
</p> </p>
<blockquote> <blockquote>git flow feature publish MYFEATURE</blockquote>
git flow feature publish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-publish"></div> <div class="feature-publish"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>게시된 기능 가져오기</h3> <h3>게시된 기능 가져오기</h3>
<p>다른 사용자가 게시한 기능을 가져옵니다.</p> <p>다른 사용자가 게시한 기능을 가져옵니다.</p>
<blockquote> <blockquote>git flow feature pull origin MYFEATURE</blockquote>
git flow feature pull origin MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="release" href="#release">Make a release</a></h2> <h2><a name="release" href="#release">Make a release</a></h2>
<ul> <ul>
<li>새로운 제품 출시 준비를 지원합니다.</li> <li>새로운 제품 출시 준비를 지원합니다.</li>
<li>출시를 위한 사소한 버그 수정이나, 메타 데이터 준비를 허용합니다.</li> <li>
출시를 위한 사소한 버그 수정이나, 메타 데이터 준비를 허용합니다.
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>릴리스 시작</h3> <h3>릴리스 시작</h3>
<p>릴리스를 시작하려면 git flow의 release 명령을 사용합니다.</p> <p>릴리스를 시작하려면 git flow의 release 명령을 사용합니다.</p>
<p>'develop' 브랜치로부터 'release' 브랜치를 생성합니다.</p> <p>'develop' 브랜치로부터 'release' 브랜치를 생성합니다.</p>
<blockquote> <blockquote>git flow release start RELEASE [BASE]</blockquote>
git flow release start RELEASE [BASE] <p>
</blockquote> 릴리스를 시작할 <code>[BASE]</code> commit sha-1 해시를 선택적으로
<p>릴리스를 시작할 <code>[BASE]</code> commit sha-1 해시를 선택적으로 줄 수도 있습니다. 그 commit은 반드시 'develop' 브랜치에 있어야합니다.</p> 줄 수도 있습니다. 그 commit은 반드시 'develop' 브랜치에
있어야합니다.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>릴리스 브랜치를 생성한 후에는 다른 개발자들의 릴리스 commit을 허용하기위해 게시(publish)하는 것이 현명합니다. 기능 게시와 비슷한 방법으로합니다.</p> <p>
<blockquote> 릴리스 브랜치를 생성한 후에는 다른 개발자들의 릴리스 commit을
git flow release publish RELEASE 허용하기위해 게시(publish)하는 것이 현명합니다. 기능 게시와 비슷한
</blockquote> 방법으로합니다.
<p>(원격 'release' 브랜치의 변경 추적은 다음과 같이 합니다<br/><code>git flow release track RELEASE</code> )</p> </p>
<blockquote>git flow release publish RELEASE</blockquote>
<p>
(원격 'release' 브랜치의 변경 추적은 다음과 같이 합니다<br /><code
>git flow release track RELEASE</code
>
)
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>릴리스 완료</h3> <h3>릴리스 완료</h3>
<p>릴리스 완료는 git 브랜치하기에서 가장 큰 단계입니다. 몇몇 작업을 수행합니다.</p> <p>
릴리스 완료는 git 브랜치하기에서 가장 큰 단계입니다. 몇몇 작업을
수행합니다.
</p>
<ul> <ul>
<li>'release' 브랜치를 'master' 브랜치에 병합(merge)</li> <li>'release' 브랜치를 'master' 브랜치에 병합(merge)</li>
<li>릴리스를 릴리스 이름으로 태그(tag)</li> <li>릴리스를 릴리스 이름으로 태그(tag)</li>
<li>릴리스를 'develop' 브랜치로 재병합(back-merge)</li> <li>릴리스를 'develop' 브랜치로 재병합(back-merge)</li>
<li>'release' 브랜치 삭제</li> <li>'release' 브랜치 삭제</li>
</ul> </ul>
<blockquote> <blockquote>git flow release finish RELEASE</blockquote>
git flow release finish RELEASE <p>
</blockquote> <code>git push --tags</code>를 사용해 태그들을 push하는 것을
<p><code>git push --tags</code>를 사용해 태그들을 push하는 것을 잊지마세요.</p> 잊지마세요.
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-end"></div> <div class="release-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2> <h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
<ul> <ul>
<li>핫픽스는 현재 출시된 제품에 문제가 생겨서 즉각 대응해야하는 상황에서 필요합니다.</li> <li>
<li>'master' 브랜치의 현재 출시된 버전으로 표기(mark)된 태그(tag)로부터 브랜치를 땁니다.</li> 핫픽스는 현재 출시된 제품에 문제가 생겨서 즉각 대응해야하는 상황에서
필요합니다.
</li>
<li>
'master' 브랜치의 현재 출시된 버전으로 표기(mark)된 태그(tag)로부터
브랜치를 땁니다.
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>핫픽스 시작</h3> <h3>핫픽스 시작</h3>
<p>여타 git flow 명령과 비슷한 방법으로 시작합니다.</p> <p>여타 git flow 명령과 비슷한 방법으로 시작합니다.</p>
<blockquote> <blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
git flow hotfix start VERSION [BASENAME]
</blockquote>
<p>여기서 버전 인수는 핫픽스 릴리스 이름을 지정합니다.</p> <p>여기서 버전 인수는 핫픽스 릴리스 이름을 지정합니다.</p>
<p>선택적으로 basename으로 시작점을 지정할 수도 있습니다.</p> <p>선택적으로 basename으로 시작점을 지정할 수도 있습니다.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>핫픽스 완료</h3> <h3>핫픽스 완료</h3>
<p>핫픽스를 종료하면 핫픽스는 'develop' 및 'master' 브랜치로 병합(merge)됩니다.</p> <p>
핫픽스를 종료하면 핫픽스는 'develop' 및 'master' 브랜치로
병합(merge)됩니다.
</p>
<p>추가적으로 'master'의 병합 부분은 핫픽스 버전으로 태그됩니다.</p> <p>추가적으로 'master'의 병합 부분은 핫픽스 버전으로 태그됩니다.</p>
<blockquote> <blockquote>git flow hotfix finish VERSION</blockquote>
git flow hotfix finish VERSION
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-end"></div> <div class="hotfix-end"></div>
</div> </div>
</div> </div>
<div> <div>
<div class="col-1"></div> <div class="col-1"></div>
<div class="col-2"> <div class="col-2">
<div class="lines-close"></div> <div class="lines-close"></div>
<div class="lines-small-end"></div> <div class="lines-small-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="commands" href="#commands">Commands</a></h2> <h2><a name="commands" href="#commands">Commands</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands" />
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Backlog</h2> <h2>Backlog</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>여기서는 모든 명령을 다루지 않았습니다. 중요한 것들만 설명했습니다.</li> <li>
<li>git 명령도 사용할 수 있습니다. git flow는 단지 도구 모음일 뿐입니다.</li> 여기서는 모든 명령을 다루지 않았습니다. 중요한 것들만 설명했습니다.
<li>'support' 기능은 아직 베타 버전입니다. 사용은 권장되지 않습니다.</li> </li>
<li>
git 명령도 사용할 수 있습니다. git flow는 단지 도구 모음일 뿐입니다.
</li>
<li>
'support' 기능은 아직 베타 버전입니다. 사용은 권장되지 않습니다.
</li>
<li>번역해주신다면 저는 행복하게 통합할 것입니다.</li> <li>번역해주신다면 저는 행복하게 통합할 것입니다.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
</div> </div>
<footer> <footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Comments</a></h2> <h2><a name="comments" href="#comments">Comments</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>
</footer> </footer>
<script type="text/javascript"> <script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */ /* * * DON'T EDIT BELOW THIS LINE * * */
(function () { (function () {
var dsq = document.createElement('script'); var dsq = document.createElement("script");
dsq.type = 'text/javascript'; dsq.type = "text/javascript";
dsq.async = true; dsq.async = true;
dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js'; dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); (
document.getElementsByTagName("head")[0] ||
document.getElementsByTagName("body")[0]
).appendChild(dsq);
})(); })();
</script> </script>
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a> <noscript
</noscript> >Please enable JavaScript to view the
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a> <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
</body> </noscript>
<a href="http://disqus.com" class="dsq-brlink"
>comments powered by <span class="logo-disqus">Disqus</span></a
>
</body>
</html> </html>

431
index.lt_LT.html
View File

@ -1,109 +1,167 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns="http://www.w3.org/1999/html"> <html lang="en" xmlns="http://www.w3.org/1999/html">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>Apie git-flow</title> <title>Apie git-flow</title>
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'> <link
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print"> href="http://fonts.googleapis.com/css?family=Sansita+One"
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print"> 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 src="js/jquery-1.7.2.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-33766650-1']); _gaq.push(["_setAccount", "UA-33766650-1"]);
_gaq.push(['_trackPageview']); _gaq.push(["_trackPageview"]);
(function () { (function () {
var ga = document.createElement('script'); var ga = document.createElement("script");
ga.type = 'text/javascript'; ga.type = "text/javascript";
ga.async = true; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; ga.src =
var s = document.getElementsByTagName('script')[0]; ("https:" == document.location.protocol
? "https://ssl"
: "http://www") + ".google-analytics.com/ga.js";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(ga, s); s.parentNode.insertBefore(ga, s);
})(); })();
</script> </script>
</head> </head>
<body> <body>
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div> <div id="banner">
<header> <a href="https://github.com/danielkummer/git-flow-cheatsheet"
>Fork me on GitHub</a
>
</div>
<header>
<h1 id="title">Apie git-flow</h1> <h1 id="title">Apie git-flow</h1>
<p id="author"> <p id="author">
sukurta <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> sukurta <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> <a
<script>!function (d, s, id) { href="https://twitter.com/share"
var js, fjs = d.getElementsByTagName(s)[0]; 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)) { if (!d.getElementById(id)) {
js = d.createElement(s); js = d.createElement(s);
js.id = id; js.id = id;
js.src = "//platform.twitter.com/widgets.js"; js.src = "//platform.twitter.com/widgets.js";
fjs.parentNode.insertBefore(js, fjs); fjs.parentNode.insertBefore(js, fjs);
} }
}(document, "script", "twitter-wjs");</script> })(document, "script", "twitter-wjs");
</script>
</p> </p>
<p id="desc">efektyvus šakojimas naudojant git-flow, autorius <a href="http://nvie.com/">Vincent Driessen</a></p> <p id="desc">
<p id="translations">vertimai: efektyvus šakojimas naudojant git-flow, autorius
<a href="#" class="active" title="english">English</a> - <a href="http://nvie.com/">Vincent Driessen</a>
</p>
<p id="translations">
vertimai: <a href="#" class="active" title="english">English</a> -
<a href="index.es_ES.html" title="spanish">Castellano</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.pt_BR.html" title="Brazilian Portugues"
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - >Brazilian Portugues</a
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - >
<a href="index.ja_JP.html" title="日本語">日本語</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.tr_TR.html" title="Turkce">Türkçe</a> -
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</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.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</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.de_DE.html" title="German">Deutsch (German)</a> -
<a href="index.ca_CA.html" title="Català">Català (Catalan)</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.ro_RO.html" title="Romanian">Română (Romanian)</a> -
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</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.uk_UK.html" title="Ukrainian">Українська (Ukrainian)</a>
<a href="index.pl_PL.html" title="Polish">Polski</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.fa_FA.html" title="فارسی">فارسی</a> - <a href="index.fa_FA.html" title="فارسی">فارسی</a> -
<a href="index.lt_LT.html" title="Lithuanian">Lietuviškai (Lithuanian)</a> <a href="index.lt_LT.html" title="Lithuanian"
>Lietuviškai (Lithuanian)</a
>
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a> <a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
</p> </p>
</header> </header>
<div id="main"> <div id="main">
<div class="scrollblock">
<div class="scrollblock">
<h2>Apie</h2> <h2>Apie</h2>
<p> <p>
git-flow yra git plėtinių rinkinys, kuris įgalina aukšto lygio repozitorijos operacijas pagal Vincent git-flow yra git plėtinių rinkinys, kuris įgalina aukšto lygio
Driessen šakojimosi modelį. repozitorijos operacijas pagal Vincent Driessen šakojimosi modelį.
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">daugiau</a></small> <small
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
>daugiau</a
></small
>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>Ši paruoštukė parodo pagrindinį git-flow operacijų panaudojimą ir efektą</p> <p>
Ši paruoštukė parodo pagrindinį git-flow operacijų panaudojimą ir
efektą
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Bendri patarimai</h2> <h2>Bendri patarimai</h2>
<ul> <ul>
<li>Git flow suteikia puikią komandinės eilutės pagalbą ir išvedimą. Skaitykite tai atsargiai, kad pamatytumėte, kas vyksta...</li> <li>
<li>macOS/Windows klientas <a href="http://www.sourcetreeapp.com/">Sourcetree</a> yra puikus git grafinis klientas ir palaiko Git flow suteikia puikią komandinės eilutės pagalbą ir išvedimą.
git-flow Skaitykite tai atsargiai, kad pamatytumėte, kas vyksta...
</li>
<li>
macOS/Windows klientas
<a href="http://www.sourcetreeapp.com/">Sourcetree</a> yra puikus
git grafinis klientas ir palaiko git-flow
</li>
<li>
Git-flow yra apjunginėjimu paremtas sprendimas. Jis nepakeičia šakų
bazės ypatybių.
</li> </li>
<li>Git-flow yra apjunginėjimu paremtas sprendimas. Jis nepakeičia šakų bazės ypatybių.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="setup" href="#setup">Nustatymas</a></h2> <h2><a name="setup" href="#setup">Nustatymas</a></h2>
<ul> <ul>
<li>Pačiai pradžiai yra reikalinga git instaliacija.</li> <li>Pačiai pradžiai yra reikalinga git instaliacija.</li>
@ -113,49 +171,50 @@
<div class="col-1"> <div class="col-1">
<h3>macOS</h3> <h3>macOS</h3>
<span>Homebrew</span> <span>Homebrew</span>
<blockquote> <blockquote>$ brew install git-flow</blockquote>
$ brew install git-flow
</blockquote>
<span>Macports</span> <span>Macports</span>
<blockquote> <blockquote>$ port install git-flow</blockquote>
$ port install git-flow
</blockquote>
<h3>Linux</h3> <h3>Linux</h3>
<blockquote> <blockquote>$ apt-get install git-flow</blockquote>
$ apt-get install git-flow
</blockquote>
<h3>Windows (Cygwin)</h3> <h3>Windows (Cygwin)</h3>
<blockquote> <blockquote>
$ wget -q -O - --no-check-certificate $ wget -q -O - --no-check-certificate
https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | bash https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh
| bash
</blockquote> </blockquote>
<p>Jums reikia wget ir util-linux, kad įdiegtumėte git-flow.</p> <p>Jums reikia wget ir util-linux, kad įdiegtumėte git-flow.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <p>
Detalesnė git flow įdiegimo instaliacija yra pasiekiama <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow Detalesnė git flow įdiegimo instaliacija yra pasiekiama
wiki</a> puslapyje. <a href="https://github.com/nvie/gitflow/wiki/Windows"
>git flow wiki</a
>
puslapyje.
</p> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow" />
</div>
</div> </div>
</div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">Pradžia</a></h2> <h2><a name="getting_started" href="#getting_started">Pradžia</a></h2>
<p>Git flow turi būti inicializuotas, kad būtų galima tinkinti jūsų projektą.</p> <p>
Git flow turi būti inicializuotas, kad būtų galima tinkinti jūsų
projektą.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Inicializacija</h3> <h3>Inicializacija</h3>
<p>Norint pradėti naudoti git-flow by esančioje git repozitorijoje:</p>
<blockquote>
git flow init
</blockquote>
<p> <p>
Jums reikės turėti atsakymus į kelis klausimus, susijusius su jūsų šakų pavadinimais.<br/> Norint pradėti naudoti git-flow by esančioje git repozitorijoje:
</p>
<blockquote>git flow init</blockquote>
<p>
Jums reikės turėti atsakymus į kelis klausimus, susijusius su jūsų
šakų pavadinimais.<br />
Rekomenduojama naudoti numatytąsias reikšmes. Rekomenduojama naudoti numatytąsias reikšmes.
</p> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="initialize"></div> <div class="initialize"></div>
@ -163,10 +222,9 @@
<div class="lines-open"></div> <div class="lines-open"></div>
<div class="lines-big"></div> <div class="lines-big"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="features" href="#features">Ypatybės</a></h2> <h2><a name="features" href="#features">Ypatybės</a></h2>
<ul class="narrow"> <ul class="narrow">
@ -179,10 +237,11 @@
<h3>Pradėti naują ypatybę</h3> <h3>Pradėti naują ypatybę</h3>
<p>Naujų ypatybių kūrimas prasideda nuo 'develop' šakos.</p> <p>Naujų ypatybių kūrimas prasideda nuo 'develop' šakos.</p>
<p>Pradėkite kurti naują ypatybę su komanda</p> <p>Pradėkite kurti naują ypatybę su komanda</p>
<blockquote> <blockquote>git flow feature start MYFEATURE</blockquote>
git flow feature start MYFEATURE <p>
</blockquote> Ši komanda sukuria naujos ypatybės šaką pagal 'develop' ir
<p>Ši komanda sukuria naujos ypatybės šaką pagal 'develop' ir pasikeičia į ją</p> pasikeičia į ją
</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -193,218 +252,240 @@
--> --></div>
</div>
<div class="col-2"> <div class="col-2">
<div class="feature-start"></div> <div class="feature-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Užbaigti ypatybę</h3> <h3>Užbaigti ypatybę</h3>
<p> <p>Užbaigti ypatybės kūrimą. Šis veiksmas atlieka tai:</p>
Užbaigti ypatybės kūrimą.
Šis veiksmas atlieka tai:
</p>
<ul> <ul>
<li>Sujungia MYFEATURE į 'develop'</li> <li>Sujungia MYFEATURE į 'develop'</li>
<li>Pašalina ypatybės šaką</li> <li>Pašalina ypatybės šaką</li>
<li>Grįžta atgal į 'develop' šaką</li> <li>Grįžta atgal į 'develop' šaką</li>
</ul> </ul>
<blockquote> <blockquote>git flow feature finish MYFEATURE</blockquote>
git flow feature finish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-end"></div> <div class="feature-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Publikuoti ypatybę</h3> <h3>Publikuoti ypatybę</h3>
<p> <p>
Ar kuriate ypatybę komandoje? <br/> Ar kuriate ypatybę komandoje? <br />
Publikuokite ypatybę į nuotolinį serverį, jog jį galėtų pasiekti kiti naudotojai. Publikuokite ypatybę į nuotolinį serverį, jog jį galėtų pasiekti
kiti naudotojai.
</p> </p>
<blockquote> <blockquote>git flow feature publish MYFEATURE</blockquote>
git flow feature publish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-publish"></div> <div class="feature-publish"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Publikuotos ypatybės gavimas</h3> <h3>Publikuotos ypatybės gavimas</h3>
<p>Gauti kito naudotojo publikuotą ypatybę.</p>
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
<p> <p>
Gauti kito naudotojo publikuotą ypatybę. Galite sekti ypatybę kilmėje naudodami
<code> git flow feature track MYFEATURE</code>
</p> </p>
<blockquote>
git flow feature pull origin MYFEATURE
</blockquote>
<p>Galite sekti ypatybę kilmėje naudodami <code> git flow feature track MYFEATURE</code> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="release" href="#release">Atlikti išleidimą</a></h2> <h2><a name="release" href="#release">Atlikti išleidimą</a></h2>
<ul> <ul>
<li>Palaiko pasiruošimą naujam išleidimui</li> <li>Palaiko pasiruošimą naujam išleidimui</li>
<li>Leidžia mažybinius trikių ištaisymus ir paruošia metaduomenis išleidimui</li> <li>
Leidžia mažybinius trikių ištaisymus ir paruošia metaduomenis
išleidimui
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Pradėti išleidimą</h3> <h3>Pradėti išleidimą</h3>
<p>Norint pradėti išledimą, naudokite git glow release komandą. Ji sukuria išleidimo šaką pagal 'develop' šaką.</p> <p>
<blockquote> Norint pradėti išledimą, naudokite git glow release komandą. Ji
git flow release start RELEASE [BASE] sukuria išleidimo šaką pagal 'develop' šaką.
</blockquote> </p>
<p>Galite pasirinktinai nurodyti <code>[BASE]</code> komito sha-1 hash'ą, nuo kurio norite pradėti. Komitas privalo būti <blockquote>git flow release start RELEASE [BASE]</blockquote>
'develop' šakoje.</p> <p>
Galite pasirinktinai nurodyti <code>[BASE]</code> komito sha-1
hash'ą, nuo kurio norite pradėti. Komitas privalo būti 'develop'
šakoje.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>Yra išmintinga publikuoti išleidimo šaką po to, kai leista daryti išleidimo komitus kitiems naudotojams. Tai daroma panašiai kaip ir su ypatybės išleidimu:</p> <p>
<blockquote> Yra išmintinga publikuoti išleidimo šaką po to, kai leista daryti
git flow release publish RELEASE išleidimo komitus kitiems naudotojams. Tai daroma panašiai kaip ir
</blockquote> su ypatybės išleidimu:
<p>(Galite sekti nuotolinį išleidimą su <br/><code>git flow release track RELEASE</code> komanda)</p> </p>
<blockquote>git flow release publish RELEASE</blockquote>
<p>
(Galite sekti nuotolinį išleidimą su <br /><code
>git flow release track RELEASE</code
>
komanda)
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Užbaigti išleidimą</h3> <h3>Užbaigti išleidimą</h3>
<p>Išleidimo užbaigimas yra vienas iš didelių žingsnių git šakojime. Jis atlieka kelis veiksmus:</p> <p>
Išleidimo užbaigimas yra vienas iš didelių žingsnių git šakojime.
Jis atlieka kelis veiksmus:
</p>
<ul> <ul>
<li>Sujungia išleidimo šaką atgal į 'master'</li> <li>Sujungia išleidimo šaką atgal į 'master'</li>
<li>Pažymi išleidimą kartu su gairės vardu</li> <li>Pažymi išleidimą kartu su gairės vardu</li>
<li>Atgal-sujungia išleidimą su 'develop'</li> <li>Atgal-sujungia išleidimą su 'develop'</li>
<li>Pašalina išledimo šaką</li> <li>Pašalina išledimo šaką</li>
</ul> </ul>
<blockquote> <blockquote>git flow release finish RELEASE</blockquote>
git flow release finish RELEASE
</blockquote>
<p>Nepamirškite persiųsti gaires su <code>git push --tags</code></p> <p>Nepamirškite persiųsti gaires su <code>git push --tags</code></p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-end"></div> <div class="release-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">Pataisymai</a></h2> <h2><a name="hotfixes" href="#hotfixes">Pataisymai</a></h2>
<ul> <ul>
<li>Pataisymai atsiranda iš būtinumo taisyti jau išleistos versijos netenkinamą būseną <li>
Pataisymai atsiranda iš būtinumo taisyti jau išleistos versijos
netenkinamą būseną
</li>
<li>
Gali būti iššakotos nuo susijusios gairės master šakoje, kuri žymi
produkcijos versiją.
</li> </li>
<li>Gali būti iššakotos nuo susijusios gairės master šakoje, kuri žymi produkcijos versiją.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>git flow hotfix start</h3> <h3>git flow hotfix start</h3>
<p>Kaip ir kitos git flow komandos, pataisymas yra pradedamas su</p> <p>Kaip ir kitos git flow komandos, pataisymas yra pradedamas su</p>
<blockquote> <blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
git flow hotfix start VERSION [BASENAME] <p>
</blockquote> Versijos argumentas čia žymi naują pataisymo išleidimo pavadinimą.
<p>Versijos argumentas čia žymi naują pataisymo išleidimo pavadinimą. Pasirinktinai dar galite nurodyti pagrindinį vardą nuo kurio pradėti.</p> Pasirinktinai dar galite nurodyti pagrindinį vardą nuo kurio
pradėti.
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Užbaigti pataisymą</h3> <h3>Užbaigti pataisymą</h3>
<p>Užbaigiant pataisymą jis yra sujungiamas atgal į develop ir master šakas. Taip pat master sujungimas yra pažymimas su pataisymo versija.</p> <p>
<blockquote> Užbaigiant pataisymą jis yra sujungiamas atgal į develop ir master
git flow hotfix finish VERSION šakas. Taip pat master sujungimas yra pažymimas su pataisymo
</blockquote> versija.
</p>
<blockquote>git flow hotfix finish VERSION</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-end"></div> <div class="hotfix-end"></div>
</div> </div>
</div> </div>
<div> <div>
<div class="col-1"></div> <div class="col-1"></div>
<div class="col-2"> <div class="col-2">
<div class="lines-close"></div> <div class="lines-close"></div>
<div class="lines-small-end"></div> <div class="lines-small-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="commands" href="#commands">Komandos</a></h2> <h2><a name="commands" href="#commands">Komandos</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands" />
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Pastabos</h2> <h2>Pastabos</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Ne visos galimos komandos yra čia aprašytos, tik svarbiausios</li> <li>Ne visos galimos komandos yra čia aprašytos, tik svarbiausios</li>
<li>Jūs vis tiek galite naudoti standartines git komandas kaip ir anksčiau, git flow yra įrankinių rinkinys <li>
Jūs vis tiek galite naudoti standartines git komandas kaip ir
anksčiau, git flow yra įrankinių rinkinys
</li>
<li>
'support' ypatybė vis dar yra beta, jos naudojimas yra nepatartinas
</li>
<li>
Jeigu norite pateikti vertimus, būsiu laimingas galėdamas juos
integruoti
</li> </li>
<li>'support' ypatybė vis dar yra beta, jos naudojimas yra nepatartinas</li>
<li>Jeigu norite pateikti vertimus, būsiu laimingas galėdamas juos integruoti</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
</div> </div>
<footer>
<footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Komentarai</a></h2> <h2><a name="comments" href="#comments">Komentarai</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>
</footer> </footer>
<script type="text/javascript"> <script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */ /* * * DON'T EDIT BELOW THIS LINE * * */
(function () { (function () {
var dsq = document.createElement('script'); var dsq = document.createElement("script");
dsq.type = 'text/javascript'; dsq.type = "text/javascript";
dsq.async = true; dsq.async = true;
dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js'; dsq.src = "http://" + disqus_shortname + ".disqus.com/embed.js";
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); (
document.getElementsByTagName("head")[0] ||
document.getElementsByTagName("body")[0]
).appendChild(dsq);
})(); })();
</script> </script>
<noscript>Įgalinkite JavaScript kad peržiūrėti <a href="http://disqus.com/?ref_noscript">komentarus palaiko Disqus.</a> <noscript
</noscript> >Įgalinkite JavaScript kad peržiūrėti
<a href="http://disqus.com" class="dsq-brlink">komantarus tvarko <span class="logo-disqus">Disqus</span></a> <a href="http://disqus.com/?ref_noscript">komentarus palaiko Disqus.</a>
</noscript>
<a href="http://disqus.com" class="dsq-brlink"
</body> >komantarus tvarko <span class="logo-disqus">Disqus</span></a
>
</body>
</html> </html>

1
index.nl_NL.html
View File

@ -55,6 +55,7 @@
<a href="index.tr_TR.html" title="Turkce">Türkçe</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.ko_KR.html" title="한국어">한국어(Korean)</a> -
<a href="index.fr_FR.html" title="Français">Français</a> - <a href="index.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="#" class="active" title="Nederlands">Nederlands</a> - <a href="#" class="active" title="Nederlands">Nederlands</a> -
<a href="index.de_DE.html" title="German">Deutsch (German)</a> - <a href="index.de_DE.html" title="German">Deutsch (German)</a> -

467
index.pl_PL.html
View File

@ -1,113 +1,173 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="pl" xmlns="http://www.w3.org/1999/html"> <html lang="pl" xmlns="http://www.w3.org/1999/html">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>ściągawka do git-flow</title> <title>ściągawka do git-flow</title>
<link href='https://fonts.googleapis.com/css?family=Lobster&subset=latin,latin-ext' rel='stylesheet' type='text/css'> <link
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print"> href="https://fonts.googleapis.com/css?family=Lobster&subset=latin,latin-ext"
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print"> 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> <style>
.title, h1, h2, h2 a, h3 { .title,
font-family: 'Lobster'; h1,
h2,
h2 a,
h3 {
font-family: "Lobster";
} }
</style> </style>
<script type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-33766650-1']); _gaq.push(["_setAccount", "UA-33766650-1"]);
_gaq.push(['_trackPageview']); _gaq.push(["_trackPageview"]);
(function () { (function () {
var ga = document.createElement('script'); var ga = document.createElement("script");
ga.type = 'text/javascript'; ga.type = "text/javascript";
ga.async = true; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; ga.src =
var s = document.getElementsByTagName('script')[0]; ("https:" == document.location.protocol
? "https://ssl"
: "http://www") + ".google-analytics.com/ga.js";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(ga, s); s.parentNode.insertBefore(ga, s);
})(); })();
</script> </script>
</head> </head>
<body> <body>
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div> <div id="banner">
<header> <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> <h1 id="title">ściągawka do git-flow</h1>
<p id="author"> <p id="author">
Autor: <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> 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> <a
<script>!function (d, s, id) { href="https://twitter.com/share"
var js, fjs = d.getElementsByTagName(s)[0]; 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)) { if (!d.getElementById(id)) {
js = d.createElement(s); js = d.createElement(s);
js.id = id; js.id = id;
js.src = "//platform.twitter.com/widgets.js"; js.src = "//platform.twitter.com/widgets.js";
fjs.parentNode.insertBefore(js, fjs); fjs.parentNode.insertBefore(js, fjs);
} }
}(document, "script", "twitter-wjs");</script> })(document, "script", "twitter-wjs");
</script>
</p> </p>
<p id="desc">sprawne rozgałęzianie z git-flow autorstwa <a href="http://nvie.com/">Vincenta Driessen'a</a></p> <p id="desc">
<p id="translations">tłumaczenia: sprawne rozgałęzianie z git-flow autorstwa
<a href="index.html" title="english">English</a> - <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.es_ES.html" title="spanish">Castellano</a> -
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> - <a href="index.pt_BR.html" title="Brazilian Portugues"
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - >Brazilian Portugues</a
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - >
<a href="index.ja_JP.html" title="日本語">日本語</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.tr_TR.html" title="Turkce">Türkçe</a> -
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</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.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</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.de_DE.html" title="German">Deutsch (German)</a> -
<a href="index.ca_CA.html" title="Català">Català (Catalan)</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.ro_RO.html" title="Romanian">Română (Romanian)</a> -
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> - <a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
<a href="index.uk_UA.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.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
<a href="#" class="active" title="Polish">Polski</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.ar_MA.html" title="العربية">العربية</a> - <a href="index.ar_MA.html" title="العربية">العربية</a> -
<a href="index.fa_FA.html" title="فارسی">فارسی</a> - <a href="index.fa_FA.html" title="فارسی">فارسی</a> -
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a> <a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a> <a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
</p> </p>
</header> </header>
<div id="main"> <div id="main">
<div class="scrollblock">
<div class="scrollblock">
<h2>Wprowadzenie</h2> <h2>Wprowadzenie</h2>
<p> <p>
git-flow jest zbiorem rozszerzeń gita dostarczającym wysokopoziomowe operacje na repozytorium, wspierającym git-flow jest zbiorem rozszerzeń gita dostarczającym wysokopoziomowe
strategię rozgałęziania opracowaną przez Vincenta Driessena. operacje na repozytorium, wspierającym strategię rozgałęziania
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">Czytaj więcej</a></small> opracowaną przez Vincenta Driessena.
<small
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
>Czytaj więcej</a
></small
>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>Ta ściągawka prezentuje podstawy użycia i efekt działania operacji git-flow.</p> <p>
Ta ściągawka prezentuje podstawy użycia i efekt działania operacji
git-flow.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Podstawowe wskazówki</h2> <h2>Podstawowe wskazówki</h2>
<ul> <ul>
<li>Git flow dostarcza świetną pomoc z poziomu wiersza poleceń. Czytaj ją uważne, aby wiedzieć, co się dzieje... <li>
Git flow dostarcza świetną pomoc z poziomu wiersza poleceń. Czytaj
ją uważne, aby wiedzieć, co się dzieje...
</li>
<li>
<a href="http://www.sourcetreeapp.com/">Sourcetree</a> - klient dla
OSX/Windowsa, który jest wyśmienitą nakładką graficzną dla gita
posiadającą wsparcie dla git-flow.
</li>
<li>
Git-flow bazuje na scalaniu. Nie używa rebase do integrowania zmian.
</li> </li>
<li><a href="http://www.sourcetreeapp.com/">Sourcetree</a> - klient dla OSX/Windowsa, który jest wyśmienitą
nakładką graficzną dla gita posiadającą wsparcie dla git-flow.</li>
<li>Git-flow bazuje na scalaniu. Nie używa rebase do integrowania zmian.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="setup" href="#setup">Konfiguracja</a></h2> <h2><a name="setup" href="#setup">Konfiguracja</a></h2>
<ul> <ul>
<li>Zanim zaczniesz, potrzebujesz działającego gita.</li> <li>Zanim zaczniesz, potrzebujesz działającego gita.</li>
@ -117,49 +177,53 @@
<div class="col-1"> <div class="col-1">
<h3>macOS</h3> <h3>macOS</h3>
<span>Homebrew</span> <span>Homebrew</span>
<blockquote> <blockquote>$ brew install git-flow-avh</blockquote>
$ brew install git-flow-avh
</blockquote>
<span>Macports</span> <span>Macports</span>
<blockquote> <blockquote>$ port install git-flow-avh</blockquote>
$ port install git-flow-avh
</blockquote>
<h3>Linux</h3> <h3>Linux</h3>
<blockquote> <blockquote>$ apt-get install git-flow</blockquote>
$ apt-get install git-flow
</blockquote>
<h3>Windows (Cygwin)</h3> <h3>Windows (Cygwin)</h3>
<blockquote> <blockquote>
$ wget -q -O - --no-check-certificate $ wget -q -O - --no-check-certificate
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
install stable | bash
</blockquote> </blockquote>
<p>Potrzebujesz wget oraz util-linux żeby zainstalować git-flow.</p> <p>Potrzebujesz wget oraz util-linux żeby zainstalować git-flow.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <p>
Szczegółową instrukcję instalacji git-flow możesz znaleźć na stronie Szczegółową instrukcję instalacji git-flow możesz znaleźć na stronie
<a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">wiki</a>. <a
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
>wiki</a
>.
</p> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow" />
</div>
</div> </div>
</div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">Pierwsze kroki</a></h2> <h2>
<p>Żeby dostosować ustawienia Twojego projektu, git flow musi zostać zainicjalizowany.</p> <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">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Inicjalizacja</h3> <h3>Inicjalizacja</h3>
<p>Rozpocznij używanie git-flow inicjalizując go w istniejącym repozytorium gita:</p>
<blockquote>
git flow init
</blockquote>
<p> <p>
Będziesz musiał odpowiedzieć na kilka pytań dotyczących nazewnictwa gałęzi.<br/> Rozpocznij używanie git-flow inicjalizując go w istniejącym
repozytorium gita:
</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. Zaleca się stosowanie wartości domyślnych.
</p> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="initialize"></div> <div class="initialize"></div>
@ -167,10 +231,9 @@
<div class="lines-open"></div> <div class="lines-open"></div>
<div class="lines-big"></div> <div class="lines-big"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="features" href="#features">Funkcjonalności</a></h2> <h2><a name="features" href="#features">Funkcjonalności</a></h2>
<ul class="narrow"> <ul class="narrow">
@ -180,14 +243,16 @@
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Rozpocznij nową funkcjonalność </h3> <h3>Rozpocznij nową funkcjonalność</h3>
<p>Rozwój nowej funkcjonalności rozpoczyna się od gałęzi 'develop'.</p> <p>
Rozwój nowej funkcjonalności rozpoczyna się od gałęzi 'develop'.
</p>
<p>Rozpocznij rozwój nowej funkcjonalności używając:</p> <p>Rozpocznij rozwój nowej funkcjonalności używając:</p>
<blockquote> <blockquote>git flow feature start MYFEATURE</blockquote>
git flow feature start MYFEATURE <p>
</blockquote> W ten sposób tworzysz gałąź dla nowej funkcjonalności bazując na
<p>W ten sposób tworzysz gałąź dla nowej funkcjonalności bazując na gałęzi 'develop' jednocześnie się na nią gałęzi 'develop' jednocześnie się na nią przełączając.
przełączając.</p> </p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -198,223 +263,249 @@
--> --></div>
</div>
<div class="col-2"> <div class="col-2">
<div class="feature-start"></div> <div class="feature-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Zakończ funkcjonalność</h3> <h3>Zakończ funkcjonalność</h3>
<p> <p>Zakończenie rozwoju funkcjonalności. Ta czynność spowoduje:</p>
Zakończenie rozwoju funkcjonalności.
Ta czynność spowoduje:
</p>
<ul> <ul>
<li>Scalenie gałęzi MYFEATURE do gałęzi 'develop'</li> <li>Scalenie gałęzi MYFEATURE do gałęzi 'develop'</li>
<li>Usunięcie gałęzi funkcjonalności</li> <li>Usunięcie gałęzi funkcjonalności</li>
<li>Przełączenie z powrotem do gałęzi 'develop'</li> <li>Przełączenie z powrotem do gałęzi 'develop'</li>
</ul> </ul>
<blockquote> <blockquote>git flow feature finish MYFEATURE</blockquote>
git flow feature finish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-end"></div> <div class="feature-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Opublikowanie funkcjonalności</h3> <h3>Opublikowanie funkcjonalności</h3>
<p> <p>
Rozwijasz funkcjonalność w grupie? <br/> Rozwijasz funkcjonalność w grupie? <br />
Opublikuj funkcjonalność na serwerze zdalnym, dzięki czemu inni też będą jej mogli z niej korzystać. Opublikuj funkcjonalność na serwerze zdalnym, dzięki czemu inni też
będą jej mogli z niej korzystać.
</p> </p>
<blockquote> <blockquote>git flow feature publish MYFEATURE</blockquote>
git flow feature publish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-publish"></div> <div class="feature-publish"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Pobieranie opublikowanej zmiany</h3> <h3>Pobieranie opublikowanej zmiany</h3>
<p>Pobierz zmianę opublikowaną przez innego użytkownika.</p>
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
<p> <p>
Pobierz zmianę opublikowaną przez innego użytkownika. Możesz śledzić zmianę na serwerze źródłowym używając
<code>git flow feature track MYFEATURE</code>
</p> </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>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="release" href="#release">Utwórz wydanie</a></h2> <h2><a name="release" href="#release">Utwórz wydanie</a></h2>
<ul> <ul>
<li>Wspomaga przygotowanie nowego wydania produkcyjnego</li> <li>Wspomaga przygotowanie nowego wydania produkcyjnego</li>
<li>Pozwala na drobne poprawki błędów oraz przygotowanie metadanych dla wydania</li> <li>
Pozwala na drobne poprawki błędów oraz przygotowanie metadanych dla
wydania
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Rozpocznij wydanie</h3> <h3>Rozpocznij wydanie</h3>
<p>Aby rozpocząć wydanie użyj polecenia git flow release. Zostanie stworzona gałąź wydania bazująca na gałęzi <p>
'develop'.</p> Aby rozpocząć wydanie użyj polecenia git flow release. Zostanie
<blockquote> stworzona gałąź wydania bazująca na gałęzi 'develop'.
git flow release start RELEASE [BASE] </p>
</blockquote> <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 <p>
musi pochodzić z gałęzi 'develop'.</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">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>Mądrze jest opublikować gałąź wydania po tym jak się ją stworzy, umożliwiając dodawanie zmian do wydania <p>
innym deweloperom. Możesz tego dokonać analogicznie Mądrze jest opublikować gałąź wydania po tym jak się ją stworzy,
do opublikowania funkcjonalności:</p> umożliwiając dodawanie zmian do wydania innym deweloperom. Możesz
<blockquote> tego dokonać analogicznie do opublikowania funkcjonalności:
git flow release publish RELEASE </p>
</blockquote> <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> <p>
(Używając polecenia <br /><code
>git flow release track RELEASE</code
>
możesz śledzić zdalne wydanie)
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Zakończ wydanie</h3> <h3>Zakończ wydanie</h3>
<p>Kończenie wydania jest jednym z dużych kroków podczas pracy z gałęziami gita. Realizuje ono szereg działań:</p> <p>
Kończenie wydania jest jednym z dużych kroków podczas pracy z
gałęziami gita. Realizuje ono szereg działań:
</p>
<ul> <ul>
<li>Scala gałąź wydania do gałęzi 'master'</li> <li>Scala gałąź wydania do gałęzi 'master'</li>
<li>Taguje wydanie jego nazwą</li> <li>Taguje wydanie jego nazwą</li>
<li>Scala z powrotem gałąź wydania do gałęzi 'develop'</li> <li>Scala z powrotem gałąź wydania do gałęzi 'develop'</li>
<li>Usuwa gałąź wydania</li> <li>Usuwa gałąź wydania</li>
</ul> </ul>
<blockquote> <blockquote>git flow release finish RELEASE</blockquote>
git flow release finish RELEASE <p>
</blockquote> Nie zapomnij o wypchnięciu tagów poleceniem
<p>Nie zapomnij o wypchnięciu tagów poleceniem <code>git push --tags</code></p> <code>git push --tags</code>
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-end"></div> <div class="release-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">Poprawki</a></h2> <h2><a name="hotfixes" href="#hotfixes">Poprawki</a></h2>
<ul> <ul>
<li>Poprawki wynikają z konieczności podjęcia natychmiastowych działań wobec niepożądanego stanu działającej <li>
w wersji produkcyjnej</li> Poprawki wynikają z konieczności podjęcia natychmiastowych działań
<li>Mogą rozgałęziać się od odpowiedniego tagu wskazującego wersję produkcyjną.</li> 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> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>git flow hotfix start</h3> <h3>git flow hotfix start</h3>
<p>Podobnie jak inne operacje git flow, poprawkę rozpoczyna się od</p> <p>Podobnie jak inne operacje git flow, poprawkę rozpoczyna się od</p>
<blockquote> <blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
git flow hotfix start VERSION [BASENAME] <p>
</blockquote> Parametr VERSION znakuje nazwę nowej poprawki. Opcjonalnie w
<p>Parametr VERSION znakuje nazwę nowej poprawki. Opcjonalnie w BASENAME możesz podać nazwę gałęzi od której BASENAME możesz podać nazwę gałęzi od której rozpoczniesz.
rozpoczniesz.</p> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Zakończ poprawkę</h3> <h3>Zakończ poprawkę</h3>
<p>Operacja kończenia poprawki scala poprawkę do gałęzi develop oraz master. Dodatkowo scalenie do gałęzi master <p>
jest tagowane wersją poprawki.</p> Operacja kończenia poprawki scala poprawkę do gałęzi develop oraz
<blockquote> master. Dodatkowo scalenie do gałęzi master jest tagowane wersją
git flow hotfix finish VERSION poprawki.
</blockquote> </p>
<blockquote>git flow hotfix finish VERSION</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-end"></div> <div class="hotfix-end"></div>
</div> </div>
</div> </div>
<div> <div>
<div class="col-1"></div> <div class="col-1"></div>
<div class="col-2"> <div class="col-2">
<div class="lines-close"></div> <div class="lines-close"></div>
<div class="lines-small-end"></div> <div class="lines-small-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="commands" href="#commands">Polecenia</a></h2> <h2><a name="commands" href="#commands">Polecenia</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands" />
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Końcowe uwagi</h2> <h2>Końcowe uwagi</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Nie zostały tutaj opisane wszystkie dostępne polecenia, a jedynie te najważniejsze</li> <li>
<li>Możesz wciąż normalnie używać gita oraz wszystkich jego poleceń tak jak to robiłeś do tej pory - git flow Nie zostały tutaj opisane wszystkie dostępne polecenia, a jedynie te
jest tylko zestawem dodatkowych narzędzi</li> najważniejsze
<li>Funkcjonalność 'support' jest wciąż w fazie beta - użycie jej nie jest zalecane</li> </li>
<li>Jeśli chciałbyś dostarczyć poprawki do tego tłumaczenia, z chęcią je dołączę.</li> <li>
Możesz wciąż normalnie używać gita 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> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
</div> </div>
<footer>
<footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Komentarze</a></h2> <h2><a name="comments" href="#comments">Komentarze</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>
</footer> </footer>
<script type="text/javascript"> <script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */ /* * * DON'T EDIT BELOW THIS LINE * * */
(function () { (function () {
var dsq = document.createElement('script'); var dsq = document.createElement("script");
dsq.type = 'text/javascript'; dsq.type = "text/javascript";
dsq.async = true; dsq.async = true;
dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js'; dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); (
document.getElementsByTagName("head")[0] ||
document.getElementsByTagName("body")[0]
).appendChild(dsq);
})(); })();
</script> </script>
<noscript>Włącz obsługę JavaScript, aby zobaczyć <a href="http://disqus.com/?ref_noscript">komentarze dostarczane przez Disqus.</a> <noscript
</noscript> >Włącz obsługę JavaScript, aby zobaczyć
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a> <a href="http://disqus.com/?ref_noscript"
>komentarze dostarczane przez Disqus.</a
>
</body> </noscript>
<a href="http://disqus.com" class="dsq-brlink"
>comments powered by <span class="logo-disqus">Disqus</span></a
>
</body>
</html> </html>

445
index.pt_BR.html
View File

@ -1,93 +1,144 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="pt" xmlns="http://www.w3.org/1999/html"> <html lang="pt" xmlns="http://www.w3.org/1999/html">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>cheatsheet do git-flow</title> <title>cheatsheet do git-flow</title>
<link href='https://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'> <link
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print"> href="https://fonts.googleapis.com/css?family=Sansita+One"
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print"> rel="stylesheet"
</head> type="text/css"
<body> />
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork no GitHub</a></div> <link
<header> 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"
/>
</head>
<body>
<div id="banner">
<a href="https://github.com/danielkummer/git-flow-cheatsheet"
>Fork no GitHub</a
>
</div>
<header>
<h1 id="title">cheatsheet do git-flow</h1> <h1 id="title">cheatsheet do git-flow</h1>
<p id="author"> <p id="author">
criado por <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> criado 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> <a
<script>!function (d, s, id) { href="https://twitter.com/share"
var js, fjs = d.getElementsByTagName(s)[0]; 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)) { if (!d.getElementById(id)) {
js = d.createElement(s); js = d.createElement(s);
js.id = id; js.id = id;
js.src = "//platform.twitter.com/widgets.js"; js.src = "//platform.twitter.com/widgets.js";
fjs.parentNode.insertBefore(js, fjs); fjs.parentNode.insertBefore(js, fjs);
} }
}(document, "script", "twitter-wjs");</script> })(document, "script", "twitter-wjs");
</script>
</p> </p>
<p id="desc">sistema de branches eficiente usando o git-flow, do <a href="http://nvie.com/">Vincent Driessen</a></p> <p id="desc">
<p id="translations">traduções: sistema de branches eficiente usando o git-flow, do
<a href="index.html" title="Inglês">English</a> - <a href="http://nvie.com/">Vincent Driessen</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="index.es_ES.html" title="spanish">Castellano</a> -
<a href="#" class="active" title="Português Brasileiro">Português Brasileiro</a> - <a href="#" class="active" title="Português Brasileiro"
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - >Português Brasileiro</a
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - >
<a href="index.ja_JP.html" title="日本語">日本語</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.tr_TR.html" title="Turkce">Türkçe</a> -
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</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.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</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.de_DE.html" title="German">Deutsch (German)</a> -
<a href="index.ca_CA.html" title="Català">Català (Catalan)</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.ro_RO.html" title="Romanian">Română (Romanian)</a> -
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> - <a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
<a href="index.uk_UA.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.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
<a href="index.pl_PL.html" title="Polish">Polski</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.ar_MA.html" title="العربية">العربية</a> - <a href="index.ar_MA.html" title="العربية">العربية</a> -
<a href="index.fa_FA.html" title="فارسی">فارسی</a> - <a href="index.fa_FA.html" title="فارسی">فارسی</a> -
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a> <a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a> <a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
</p> </p>
</header> </header>
<div id="main"> <div id="main">
<div class="scrollblock">
<h2><a name="sobre" href="#sobre">Sobre</a></h2>
<div class="scrollblock">
<h2><a name="sobre" href="#sobre" >Sobre</a></h2>
<p> <p>
O git-flow é um conjunto de extensões para o git que provê operações de alto-nível para O git-flow é um conjunto de extensões para o git que provê operações
repositórios usando o modelo de branches do Vincent Driessen. de alto-nível para repositórios usando o modelo de branches do Vincent
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">mais</a></small> Driessen.
<small
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
>mais</a
></small
>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>Este cheatsheet demonstra o uso básico e o efeito das operações do git-flow</p> <p>
Este cheatsheet demonstra o uso básico e o efeito das operações do
git-flow
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="dicas_basicas" href="#dicas_basicas" >Dicas básicas</a></h2> <h2><a name="dicas_basicas" href="#dicas_basicas">Dicas básicas</a></h2>
<ul> <ul>
<li>O git-flow oferece na linha de comando ajuda e saídas excelentes. Leia atentamente para ver o que está <li>
acontecendo...</li> O git-flow oferece na linha de comando ajuda e saídas excelentes.
<li>O cliente do macOS <a href="http://www.sourcetreeapp.com/">Sourcetree</a> é um excelente gui para o git e Leia atentamente para ver o que está acontecendo...
tem suporte ao git-flow </li>
<li>
O cliente do macOS
<a href="http://www.sourcetreeapp.com/">Sourcetree</a> é um
excelente gui para o git e tem suporte ao git-flow
</li> </li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock">
<div class="scrollblock"> <h2><a name="instalacao" href="#instalacao">Instalação</a></h2>
<h2><a name="instalacao" href="#instalacao" >Instalação</a></h2>
<ul> <ul>
<li>Você precisa do git instalado como pré-requisito.</li> <li>Você precisa do git instalado como pré-requisito.</li>
<li>O git flow funciona no macOS, Linux e no Windows</li> <li>O git flow funciona no macOS, Linux e no Windows</li>
@ -96,49 +147,50 @@
<div class="col-1"> <div class="col-1">
<h3>macOS</h3> <h3>macOS</h3>
<span>Homebrew</span> <span>Homebrew</span>
<blockquote> <blockquote>$ brew install git-flow-avh</blockquote>
$ brew install git-flow-avh
</blockquote>
<span>Macports</span> <span>Macports</span>
<blockquote> <blockquote>$ port install git-flow-avh</blockquote>
$ port install git-flow-avh
</blockquote>
<h3>Linux</h3> <h3>Linux</h3>
<blockquote> <blockquote>$ apt-get install git-flow</blockquote>
$ apt-get install git-flow
</blockquote>
<h3>Windows (Cygwin)</h3> <h3>Windows (Cygwin)</h3>
<blockquote> <blockquote>
$ wget -q -O - --no-check-certificate $ wget -q -O - --no-check-certificate
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
install stable | bash
</blockquote> </blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <p>
Para instruções detalhadas sobre a instalação, visite Para instruções detalhadas sobre a instalação, visite a
a <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">wiki <a
do git-flow</a>. href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
>wiki do git-flow</a
>.
</p> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow" />
</div>
</div> </div>
</div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comecando" href="#comecando" >Começando</a></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>
O git-flow precisa ser inicializado para personalizar a configuração
de seu projeto.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Inicialização</h3> <h3>Inicialização</h3>
<p>Comece o uso do git-flow fazendo sua inicialização dentro de um repositório git existente:</p>
<blockquote>
git flow init
</blockquote>
<p> <p>
Você precisa responder algumas questões relativas às convenções de nomenclatura dos seus branches.<br/> Comece o uso do git-flow fazendo sua inicialização dentro de um
repositório git existente:
</p>
<blockquote>git flow init</blockquote>
<p>
Você precisa responder algumas questões relativas às convenções de
nomenclatura dos seus branches.<br />
É recomendado que sejam usados os valores padrões. É recomendado que sejam usados os valores padrões.
</p> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="initialize"></div> <div class="initialize"></div>
@ -146,39 +198,46 @@
<div class="lines-open"></div> <div class="lines-open"></div>
<div class="lines-big"></div> <div class="lines-big"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock"> <h2>
<h2><a name="features" href="#features" >Funcionalidades/features</a></h2> <a name="features" href="#features">Funcionalidades/features</a>
</h2>
<ul class="narrow"> <ul class="narrow">
<li>Desenvolva novas funcionalidades para as versões futuras</li> <li>Desenvolva novas funcionalidades para as versões futuras</li>
<li>Normalmente existem apenas nos repositórios dos desenvolvedores</li> <li>
Normalmente existem apenas nos repositórios dos desenvolvedores
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Começar uma nova funcionalidade</h3> <h3>Começar uma nova funcionalidade</h3>
<p>O desenvolvimento de novas funcionalidades começa no branch 'develop'.</p> <p>
O desenvolvimento de novas funcionalidades começa no branch
'develop'.
</p>
<p>Comece o desenvolvimento de uma nova funcionalidade com</p> <p>Comece o desenvolvimento de uma nova funcionalidade com</p>
<blockquote> <blockquote>git flow feature start MYFEATURE</blockquote>
git flow feature start MYFEATURE <p>
</blockquote> Esse comando cria um novo branch da funcionalidade baseado no
<p>Esse comando cria um novo branch da funcionalidade baseado no 'develop' e alterna para ele</p> 'develop' e alterna para ele
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-start"></div> <div class="feature-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finalizar uma funcionalidade</h3> <h3>Finalizar uma funcionalidade</h3>
<p> <p>
Finaliza o desenvolvimento de uma funcionalidade. Finaliza o desenvolvimento de uma funcionalidade. Esse comando faz o
Esse comando faz o seguinte seguinte
</p> </p>
<ul> <ul>
<li>Mescla MYFEATURE no 'develop'</li> <li>Mescla MYFEATURE no 'develop'</li>
@ -186,35 +245,31 @@
<li>Volta para o branch 'develop'</li> <li>Volta para o branch 'develop'</li>
</ul> </ul>
<blockquote> <blockquote>git flow feature finish MYFEATURE</blockquote>
git flow feature finish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-end"></div> <div class="feature-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Publicar uma funcionalidade</h3> <h3>Publicar uma funcionalidade</h3>
<p> <p>
Você está desenvolvendo uma funcionalidade colaborativamente? <br/> Você está desenvolvendo uma funcionalidade colaborativamente? <br />
Publique uma funcionalidade para o servidor remoto, assim ela pode ser Publique uma funcionalidade para o servidor remoto, assim ela pode
utilizada por outros usuários. ser utilizada por outros usuários.
</p> </p>
<blockquote> <blockquote>git flow feature publish MYFEATURE</blockquote>
git flow feature publish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-publish"></div> <div class="feature-publish"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Obter uma funcionalidade publicada</h3> <h3>Obter uma funcionalidade publicada</h3>
@ -223,174 +278,206 @@
as alterações remotas. as alterações remotas.
</p> </p>
<blockquote> <blockquote>git flow feature pull MYFEATURE</blockquote>
git flow feature pull MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock"> <h2><a name="release" href="#release">Criar uma versão/release</a></h2>
<h2><a name="release" href="#release" >Criar uma versão/release</a></h2>
<ul> <ul>
<li>Auxilia a preparação de uma nova versão de produção</li> <li>Auxilia a preparação de uma nova versão de produção</li>
<li>Permite correções de bugs menores e a preparação de metadados de uma versão</li> <li>
Permite correções de bugs menores e a preparação de metadados de uma
versão
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Começar uma versão</h3> <h3>Começar uma versão</h3>
<p>Para começar uma versão, use o comando git flow release. Ele<br/> <p>
Para começar uma versão, use o comando git flow release. Ele<br />
cria um branch da versão baseado no branch 'develop'. cria um branch da versão baseado no branch 'develop'.
</p> </p>
<blockquote> <blockquote>git flow release start RELEASE [BASE]</blockquote>
git flow release start RELEASE [BASE] <p>
</blockquote> Você pode opcionalmente fornecer um hash sha-1 do commit
<p>Você pode opcionalmente fornecer um hash sha-1 do commit <code>[BASE]</code> de onde começar a versão. O <code>[BASE]</code> de onde começar a versão. O commit precisa estar
commit precisa estar no branch 'develop'</p> no branch 'develop'
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>É sensato publicar o branch da versão depois de criá-lo, para permitir commits por outros <p>
desenvolvedores. É semelhante à publicação de uma funcionalidade com o comando:</p> É sensato publicar o branch da versão depois de criá-lo, para
<blockquote> permitir commits por outros desenvolvedores. É semelhante à
git flow release publish RELEASE publicação de uma funcionalidade com o comando:
</blockquote> </p>
<p>(Você pode acompanhar uma versão remota com o comando <br/><code>git flow release track RELEASE</code>)</p> <blockquote>git flow release publish RELEASE</blockquote>
<p>
(Você pode acompanhar uma versão remota com o comando <br /><code
>git flow release track RELEASE</code
>)
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finalizar uma versão</h3> <h3>Finalizar uma versão</h3>
<p>A finalização de uma versão é um dos grandes passos na ramificação/branching do git. Ele executa várias ações:</p> <p>
A finalização de uma versão é um dos grandes passos na
ramificação/branching do git. Ele executa várias ações:
</p>
<ul> <ul>
<li>Mescla o branch da versão no 'master'</li> <li>Mescla o branch da versão no 'master'</li>
<li>Etiqueta a versão com seu nome</li> <li>Etiqueta a versão com seu nome</li>
<li>Mescla o branch da versão de volta no 'develop'</li> <li>Mescla o branch da versão de volta no 'develop'</li>
<li>Remove o branch da versão</li> <li>Remove o branch da versão</li>
</ul> </ul>
<blockquote> <blockquote>git flow release finish RELEASE</blockquote>
git flow release finish RELEASE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-end"></div> <div class="release-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes" >Hotfixes</a></h2> <h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
<ul> <ul>
<li>Os hotfixes surgem da necessidade de agir imediatamente sobre uma situação indesejada na versão de produção ativa</li> <li>
<li>Pode ser criado a partir da tag correspondente no branch master que indica a versão em produção.</li> Os hotfixes surgem da necessidade de agir imediatamente sobre uma
situação indesejada na versão de produção ativa
</li>
<li>
Pode ser criado a partir da tag correspondente no branch master que
indica a versão em produção.
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>git flow hotfix start</h3> <h3>git flow hotfix start</h3>
<p>Assim como os outros comandos do git flow, um hotfix inicia com</p> <p>Assim como os outros comandos do git flow, um hotfix inicia com</p>
<blockquote> <blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
git flow hotfix start VERSION [BASENAME] <p>
</blockquote> O argumento version marca o nome do novo hotfix. Opcionalmente, você
<p>O argumento version marca o nome do novo hotfix. Opcionalmente, você pode especificar um basename para começar.</p> pode especificar um basename para começar.
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finalizar um hotfix</h3> <h3>Finalizar um hotfix</h3>
<p>Ao finalizar um hotfix ele é mesclado tanto no develop quanto no master. Além disso, o merge no master é etiquetado.</p> <p>
<blockquote> Ao finalizar um hotfix ele é mesclado tanto no develop quanto no
git flow hotfix finish VERSION master. Além disso, o merge no master é etiquetado.
</blockquote> </p>
<blockquote>git flow hotfix finish VERSION</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-end"></div> <div class="hotfix-end"></div>
</div> </div>
</div> </div>
<div> <div>
<div class="col-1"></div> <div class="col-1"></div>
<div class="col-2"> <div class="col-2">
<div class="lines-close"></div> <div class="lines-close"></div>
<div class="lines-small-end"></div> <div class="lines-small-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<h2><a name="comandos" href="#comandos">Comandos</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands" />
</div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comandos" href="#comandos" >Comandos</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
</div>
<div class="scrollblock">
<h2>Backlog</h2> <h2>Backlog</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Nem todos os comandos disponíveis estão cobertos aqui, apenas os mais importantes deles</li> <li>
<li>Você pode continuar a usar o git e todos os comandos dele normalmente como você já conhece, o git flow Nem todos os comandos disponíveis estão cobertos aqui, apenas os
é apenas uma coleção de ferramentas</li> mais importantes deles
<li>A funcionalidade 'support' continua no estágio beta, seu uso não é indicado</li> </li>
<li>Se você quiser fornecer traduções, ficarei feliz de integrá-las</li> <li>
Você pode continuar a usar o git e todos os comandos dele
normalmente como você já conhece, o git flow é apenas uma coleção de
ferramentas
</li>
<li>
A funcionalidade 'support' continua no estágio beta, seu uso não é
indicado
</li>
<li>
Se você quiser fornecer traduções, ficarei feliz de integrá-las
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
</div> </div>
<footer>
<footer>
<div class="scrollblock"> <div class="scrollblock">
<h2>Comentários</h2> <h2>Comentários</h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>
</footer> </footer>
<script type="text/javascript"> <script type="text/javascript">
/* * * Google Analytics * * */ /* * * Google Analytics * * */
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-33766650-1']); _gaq.push(["_setAccount", "UA-33766650-1"]);
_gaq.push(['_trackPageview']); _gaq.push(["_trackPageview"]);
(function () { (function () {
var ga = document.createElement('script'); var ga = document.createElement("script");
ga.type = 'text/javascript'; ga.type = "text/javascript";
ga.async = true; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; ga.src =
var s = document.getElementsByTagName('script')[0]; ("https:" == document.location.protocol
? "https://ssl"
: "http://www") + ".google-analytics.com/ga.js";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(ga, s); s.parentNode.insertBefore(ga, s);
})(); })();
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */ /* * * DON'T EDIT BELOW THIS LINE * * */
(function () { (function () {
var dsq = document.createElement('script'); var dsq = document.createElement("script");
dsq.type = 'text/javascript'; dsq.type = "text/javascript";
dsq.async = true; dsq.async = true;
dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js'; dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); (
document.getElementsByTagName("head")[0] ||
document.getElementsByTagName("body")[0]
).appendChild(dsq);
})(); })();
</script> </script>
<noscript>Habilite o JavaScript para ver os <a href="http://disqus.com/?ref_noscript">comentários criados com o Disqus.</a> <noscript
</noscript> >Habilite o JavaScript para ver os
<a href="http://disqus.com" class="dsq-brlink">comentários criados com o <span class="logo-disqus">Disqus</span></a> <a href="http://disqus.com/?ref_noscript"
>comentários criados com o Disqus.</a
>
</body> </noscript>
<a href="http://disqus.com" class="dsq-brlink"
>comentários criados com o <span class="logo-disqus">Disqus</span></a
>
</body>
</html> </html>

461
index.ro_RO.html
View File

@ -1,107 +1,166 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns="http://www.w3.org/1999/html"> <html lang="en" xmlns="http://www.w3.org/1999/html">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>git-flow cheatsheet</title> <title>git-flow cheatsheet</title>
<link href='https://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'> <link
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print"> href="https://fonts.googleapis.com/css?family=Sansita+One"
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print"> 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 type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-33766650-1']); _gaq.push(["_setAccount", "UA-33766650-1"]);
_gaq.push(['_trackPageview']); _gaq.push(["_trackPageview"]);
(function () { (function () {
var ga = document.createElement('script'); var ga = document.createElement("script");
ga.type = 'text/javascript'; ga.type = "text/javascript";
ga.async = true; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; ga.src =
var s = document.getElementsByTagName('script')[0]; ("https:" == document.location.protocol
? "https://ssl"
: "http://www") + ".google-analytics.com/ga.js";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(ga, s); s.parentNode.insertBefore(ga, s);
})(); })();
</script> </script>
</head> </head>
<body> <body>
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div> <div id="banner">
<header> <a href="https://github.com/danielkummer/git-flow-cheatsheet"
>Fork me on GitHub</a
>
</div>
<header>
<h1 id="title">git-flow cheatsheet</h1> <h1 id="title">git-flow cheatsheet</h1>
<p id="author"> <p id="author">
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> 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> <a
<script>!function (d, s, id) { href="https://twitter.com/share"
var js, fjs = d.getElementsByTagName(s)[0]; 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)) { if (!d.getElementById(id)) {
js = d.createElement(s); js = d.createElement(s);
js.id = id; js.id = id;
js.src = "//platform.twitter.com/widgets.js"; js.src = "//platform.twitter.com/widgets.js";
fjs.parentNode.insertBefore(js, fjs); fjs.parentNode.insertBefore(js, fjs);
} }
}(document, "script", "twitter-wjs");</script> })(document, "script", "twitter-wjs");
</script>
</p> </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="desc">
<p id="translations">traduceri: lucrul eficient cu branch-uri folosind git-flow al lui
<a href="index.html" title="english">English</a> - <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.es_ES.html" title="spanish">Castellano</a> -
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> - <a href="index.pt_BR.html" title="Brazilian Portugues"
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - >Brazilian Portugues</a
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - >
<a href="index.ja_JP.html" title="日本語">日本語</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.tr_TR.html" title="Turkce">Türkçe</a> -
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</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.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</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.de_DE.html" title="German">Deutsch (German)</a> -
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> - <a href="index.ca_CA.html" title="Català">Català (Catalan)</a> -
<a href="#" class="active" title="Romanian">Română (Romanian)</a> - <a href="#" class="active" title="Romanian">Română (Romanian)</a> -
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> - <a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
<a href="index.uk_UA.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.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
<a href="index.pl_PL.html" title="Polish">Polski</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.ar_MA.html" title="العربية">العربية</a> - <a href="index.ar_MA.html" title="العربية">العربية</a> -
<a href="index.fa_FA.html" title="فارسی">فارسی</a> - <a href="index.fa_FA.html" title="فارسی">فارسی</a> -
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a> <a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a> <a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
</p> </p>
</header> </header>
<div id="main"> <div id="main">
<div class="scrollblock">
<div class="scrollblock">
<h2>Despre</h2> <h2>Despre</h2>
<p> <p>
git-flow sunt un set de extensii git care furnizează operații de nivel înalt pentru întreg repository-ul git-flow sunt un set de extensii git care furnizează operații de nivel
folosind modelul de branch-uri al lui Vincent Driessen. înalt pentru întreg repository-ul folosind modelul de branch-uri al
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">mai mult</a></small> lui Vincent Driessen.
<small
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
>mai mult</a
></small
>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>Această copiuță arată scenariile de bază, precum și efectul folosirii operațiilor git-flow.</p> <p>
Această copiuță arată scenariile de bază, precum și efectul folosirii
operațiilor git-flow.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Pentru început</h2> <h2>Pentru început</h2>
<ul> <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>
<li>Clientul <a href="http://www.sourcetreeapp.com/">Sourcetree</a> pentru macOS/Windows este o interfață excelentă pentru git și are suport pentru git-flow</li> Git flow oferă ajutor și output excelente direct în linia de
<li>Git-flow este o soluție bazată pe merge-uri. Nu face rebase pe branch-urile de tip feature.</li> 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
macOS/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> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="setup" href="#setup">Instalare</a></h2> <h2><a name="setup" href="#setup">Instalare</a></h2>
<ul> <ul>
<li>Ca și precondiții este nevoie de o instalare git funcțională.</li> <li>Ca și precondiții este nevoie de o instalare git funcțională.</li>
@ -111,48 +170,56 @@
<div class="col-1"> <div class="col-1">
<h3>macOS</h3> <h3>macOS</h3>
<span>Homebrew</span> <span>Homebrew</span>
<blockquote> <blockquote>$ brew install git-flow-avh</blockquote>
$ brew install git-flow-avh
</blockquote>
<span>Macports</span> <span>Macports</span>
<blockquote> <blockquote>$ port install git-flow-avh</blockquote>
$ port install git-flow-avh
</blockquote>
<h3>Linux</h3> <h3>Linux</h3>
<blockquote> <blockquote>$ apt-get install git-flow</blockquote>
$ apt-get install git-flow
</blockquote>
<h3>Windows (Cygwin)</h3> <h3>Windows (Cygwin)</h3>
<blockquote> <blockquote>
$ wget -q -O - --no-check-certificate $ wget -q -O - --no-check-certificate
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
install stable | bash
</blockquote> </blockquote>
<p>Vei avea nevoie de wget și de util-linux pentru a instala git-flow.</p> <p>
Vei avea nevoie de wget și de util-linux pentru a instala git-flow.
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <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>. 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> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow" />
</div>
</div> </div>
</div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">La început</a></h2> <h2>
<p>Git flow trebuie să fie inițializat pentru a putea personaliza proiectul tău.</p> <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">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Inițializare</h3> <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> <p>
Va fi necesar să răspunzi la căteva întrebări legate de convențiile de numire pentru branch-urile tale.<br/> Î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. Se recomandă să folosești valorile implicite.
</p> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="initialize"></div> <div class="initialize"></div>
@ -160,11 +227,12 @@
<div class="lines-open"></div> <div class="lines-open"></div>
<div class="lines-big"></div> <div class="lines-big"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock"> <h2>
<h2><a name="features" href="#features">Funcționalități/Features</a></h2> <a name="features" href="#features">Funcționalități/Features</a>
</h2>
<ul class="narrow"> <ul class="narrow">
<li>Dezvoltă noi funcționalități pentru viitoarele release-uri</li> <li>Dezvoltă noi funcționalități pentru viitoarele release-uri</li>
@ -174,12 +242,15 @@
<div class="col-1"> <div class="col-1">
<h3>Începere funcționalitate nouă</h3> <h3>Începere funcționalitate nouă</h3>
<p>Dezvoltarea de funcționalități noi începe din branch-ul 'develop'.</p> <p>
Dezvoltarea de funcționalități noi începe din branch-ul 'develop'.
</p>
<p>Începe dezvoltarea unei funcționalități noi cu</p> <p>Începe dezvoltarea unei funcționalități noi cu</p>
<blockquote> <blockquote>git flow feature start MYFEATURE</blockquote>
git flow feature start MYFEATURE <p>
</blockquote> Această acțiune crează un nou branch bazat pe 'develop' și se mută
<p>Această acțiune crează un nou branch bazat pe 'develop' și se mută pe el</p> pe el
</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -190,20 +261,19 @@
--> --></div>
</div>
<div class="col-2"> <div class="col-2">
<div class="feature-start"></div> <div class="feature-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finalizare funcționalitate</h3> <h3>Finalizare funcționalitate</h3>
<p> <p>
Încheie dezvoltarea unei funcționalități. Încheie dezvoltarea unei funcționalități. Această acțiune execută
Această acțiune execută următoarele operații următoarele operații
</p> </p>
<ul> <ul>
<li>Face merge al branch-ului MYFEATURE în 'develop'</li> <li>Face merge al branch-ului MYFEATURE în 'develop'</li>
@ -211,196 +281,233 @@
<li>Se mută înapoi pe branch-ul 'develop'</li> <li>Se mută înapoi pe branch-ul 'develop'</li>
</ul> </ul>
<blockquote> <blockquote>git flow feature finish MYFEATURE</blockquote>
git flow feature finish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-end"></div> <div class="feature-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Publicare funcționalitate</h3> <h3>Publicare funcționalitate</h3>
<p> <p>
Dezvolți funcționalitate în colaborare cu altcineva? <br/> 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. Publică-ți funcționalitatea pe server, ca ea să poată fi folosită și
de alți utilizatori.
</p> </p>
<blockquote> <blockquote>git flow feature publish MYFEATURE</blockquote>
git flow feature publish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-publish"></div> <div class="feature-publish"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Obținerea unei funcționalități publicate</h3> <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> <p>
Obține funcționalitate publicată de către un alt utilizator. Poți urmări o funcționalitate la repository-ul origine folosind
<code> git flow feature track MYFEATURE</code>
</p> </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>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="release" href="#release">Predare/Release</a></h2> <h2><a name="release" href="#release">Predare/Release</a></h2>
<ul> <ul>
<li>Ajută la pregătirea unui nou release în producție</li> <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> <li>
Permite fixarea unor probleme minore, precum și pregătirea
meta-datelor asociate unui release
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Începere release</h3> <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> <p>
<blockquote> Pentru a începe un release nou, folosește comanda git flow release.
git flow release start RELEASE [BAZE] Aceasta crează un nou branch de tip release bazat pe branch-ul
</blockquote> 'develop'.
<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>
<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">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</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> <p>
<blockquote> Este înțelept a publica branch-ul de release după ce a fost creat,
git flow release publish RELEASE pentru a permite și altor programatori să contribuie. Acest proces
</blockquote> este similar celui de publicare funcționalitate; se folosește
<p>(Poți urmări un release cu comanda <br/><code>git flow release track RELEASE</code>)</p> 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>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finalizare release</h3> <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> <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> <ul>
<li>Merge al branch-ului release înapoi în 'master'</li> <li>Merge al branch-ului release înapoi în 'master'</li>
<li>Crează tag (etichetă) pentru release, cu numele acestuia</li> <li>Crează tag (etichetă) pentru release, cu numele acestuia</li>
<li>Merge al release-ului în branch-ul 'develop'</li> <li>Merge al release-ului în branch-ul 'develop'</li>
<li>Șterge branch-ul de release</li> <li>Șterge branch-ul de release</li>
</ul> </ul>
<blockquote> <blockquote>git flow release finish RELEASE</blockquote>
git flow release finish RELEASE <p>
</blockquote> Nu uita să publici etichetele cu comanda
<p>Nu uita să publici etichetele cu comanda <code>git push --tags</code></p> <code>git push --tags</code>
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-end"></div> <div class="release-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">Corecturi/Hotfixes</a></h2> <h2><a name="hotfixes" href="#hotfixes">Corecturi/Hotfixes</a></h2>
<ul> <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>
<li>Se poate baza pe eticheta de pe branch-ul master corespunzătoare release-ului țintit.</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> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Începere corectură</h3> <h3>Începere corectură</h3>
<p>Asemeni celorlalte comezi git flow, o corectură se începe cu</p> <p>Asemeni celorlalte comezi git flow, o corectură se începe cu</p>
<blockquote> <blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
git flow hotfix start VERSION [BASENAME] <p>
</blockquote> Argumentul VERSION markează noul nume de release ce va fi atribuit
<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> corecturii. În mod opțional poți preciza un nume de bază de la care
se va porni în crearea corecturii.
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finalizare corectură</h3> <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> <p>
<blockquote> Prin finalizarea unei corecturi, aceasta va fi merge-uită înapoi în
git flow hotfix finish VERSION branch-urile 'develop' și 'master'. Suplimentar, 'master' va fi
</blockquote> etichetat cu versiunea corecturii.
</p>
<blockquote>git flow hotfix finish VERSION</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-end"></div> <div class="hotfix-end"></div>
</div> </div>
</div> </div>
<div> <div>
<div class="col-1"></div> <div class="col-1"></div>
<div class="col-2"> <div class="col-2">
<div class="lines-close"></div> <div class="lines-close"></div>
<div class="lines-small-end"></div> <div class="lines-small-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="commands" href="#commands">Comenzi</a></h2> <h2><a name="commands" href="#commands">Comenzi</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands" />
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Rezerve</h2> <h2>Rezerve</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Nu toate comenzile disponibile sunt acoperite aici, ci doar cele mai importante</li> <li>
<li>Poți folosi în continuare git și toate comenzile sale în mod normal, așa cum le cunoști, deoarece git flow Nu toate comenzile disponibile sunt acoperite aici, ci doar cele mai
este doar o colecție de instrumente suplimentare 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> </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> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
</div> </div>
<footer>
<footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Comentarii</a></h2> <h2><a name="comments" href="#comments">Comentarii</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>
</footer> </footer>
<script type="text/javascript"> <script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */ /* * * DON'T EDIT BELOW THIS LINE * * */
(function () { (function () {
var dsq = document.createElement('script'); var dsq = document.createElement("script");
dsq.type = 'text/javascript'; dsq.type = "text/javascript";
dsq.async = true; dsq.async = true;
dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js'; dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); (
document.getElementsByTagName("head")[0] ||
document.getElementsByTagName("body")[0]
).appendChild(dsq);
})(); })();
</script> </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
</noscript> >Te rugăm să activezi JavaScript pentru a vizualiza
<a href="http://disqus.com" class="dsq-brlink">comentarii cu sprijinul <span class="logo-disqus">Disqus</span></a> <a href="http://disqus.com/?ref_noscript"
>comentariile oferite cu sprijinul Disqus.</a
>
</body> </noscript>
<a href="http://disqus.com" class="dsq-brlink"
>comentarii cu sprijinul <span class="logo-disqus">Disqus</span></a
>
</body>
</html> </html>

467
index.ru_RU.html
View File

@ -1,116 +1,178 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns="http://www.w3.org/1999/html"> <html lang="en" xmlns="http://www.w3.org/1999/html">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>Шпаргалка по git-flow</title> <title>Шпаргалка по git-flow</title>
<!-- Lobster is same as Sansita but with cyrillic and another subsets. I recomend to use Lobster instead Sansita everywere--> <!-- Lobster is same as Sansita but with cyrillic and another subsets. I recomend to use Lobster instead Sansita everywere-->
<link href='https://fonts.googleapis.com/css?family=Lobster&subset=latin,cyrillic' rel='stylesheet' type='text/css'> <link
href="https://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
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print"> 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> <style>
.title, h1, h2, h2 a, h3 { .title,
font-family: 'Lobster'; h1,
h2,
h2 a,
h3 {
font-family: "Lobster";
} }
</style> </style>
<script type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-33766650-1']); _gaq.push(["_setAccount", "UA-33766650-1"]);
_gaq.push(['_trackPageview']); _gaq.push(["_trackPageview"]);
(function () { (function () {
var ga = document.createElement('script'); var ga = document.createElement("script");
ga.type = 'text/javascript'; ga.type = "text/javascript";
ga.async = true; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; ga.src =
var s = document.getElementsByTagName('script')[0]; ("https:" == document.location.protocol
? "https://ssl"
: "http://www") + ".google-analytics.com/ga.js";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(ga, s); s.parentNode.insertBefore(ga, s);
})(); })();
</script> </script>
</head> </head>
<body> <body>
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div> <div id="banner">
<header> <a href="https://github.com/danielkummer/git-flow-cheatsheet"
>Fork me on GitHub</a
>
</div>
<header>
<h1 id="title">Шпаргалка по git-flow</h1> <h1 id="title">Шпаргалка по git-flow</h1>
<p id="author"> <p id="author">
создал <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> создал <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> <a
<script>!function (d, s, id) { href="https://twitter.com/share"
var js, fjs = d.getElementsByTagName(s)[0]; 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)) { if (!d.getElementById(id)) {
js = d.createElement(s); js = d.createElement(s);
js.id = id; js.id = id;
js.src = "//platform.twitter.com/widgets.js"; js.src = "//platform.twitter.com/widgets.js";
fjs.parentNode.insertBefore(js, fjs); fjs.parentNode.insertBefore(js, fjs);
} }
}(document, "script", "twitter-wjs");</script> })(document, "script", "twitter-wjs");
</script>
</p> </p>
<p id="desc">эффективное ветвление с помощью git-flow от <a href="http://nvie.com/">Vincent Driessen</a></p> <p id="desc">
<p id="translations">переводы: эффективное ветвление с помощью git-flow от
<a href="index.html" title="english">English</a> - <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.es_ES.html" title="spanish">Castellano</a> -
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> - <a href="index.pt_BR.html" title="Brazilian Portugues"
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - >Brazilian Portugues</a
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - >
<a href="index.ja_JP.html" title="日本語">日本語</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.tr_TR.html" title="Turkce">Türkçe</a> -
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</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.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="#" class="active" title="Russian">Русский (Russian)</a> - <a href="#" class="active" title="Russian">Русский (Russian)</a> -
<a href="index.de_DE.html" title="German">Deutsch (German)</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.ca_CA.html" title="Català">Català (Catalan)</a> -
<a href="index.ro_RO.html" title="Romanian">Română (Romanian)</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.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
<a href="index.uk_UA.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.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
<a href="index.pl_PL.html" title="Polish">Polski</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.ar_MA.html" title="العربية">العربية</a> - <a href="index.ar_MA.html" title="العربية">العربية</a> -
<a href="index.fa_FA.html" title="فارسی">فارسی</a> - <a href="index.fa_FA.html" title="فارسی">فارسی</a> -
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a> <a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a> <a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
</p> </p>
</header> </header>
<div id="main"> <div id="main">
<div class="scrollblock">
<div class="scrollblock">
<h2>Введение</h2> <h2>Введение</h2>
<p> <p>
git-flow — это набор расширений git предоставляющий высокоуровневые операции над репозиторием для поддержки модели ветвления Vincent git-flow — это набор расширений git предоставляющий высокоуровневые
операции над репозиторием для поддержки модели ветвления Vincent
Driessen. Driessen.
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">узнать больше</a></small> <small
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
>узнать больше</a
></small
>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>Эта шпаргалка показывает основные способы использования операций git-flow.</p> <p>
Эта шпаргалка показывает основные способы использования операций
git-flow.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Общие замечания</h2> <h2>Общие замечания</h2>
<ul> <ul>
<li>Git flow предоставляет превосходную командную строку со справкой и улучшенными выводом. Внимательно читайте его, чтобы знать, что происходит...</li> <li>
<li>Клиент для macOS/Windows <a href="http://www.sourcetreeapp.com/">Sourcetree</a> — отличный GUI для Git — также поддерживает git-flow Git flow предоставляет превосходную командную строку со справкой и
улучшенными выводом. Внимательно читайте его, чтобы знать, что
происходит...
</li>
<li>
Клиент для macOS/Windows
<a href="http://www.sourcetreeapp.com/">Sourcetree</a> — отличный
GUI для Git — также поддерживает git-flow
</li>
<li>
Git-flow основан на слиянии. Для слияния веток фич не используется
rebase.
</li> </li>
<li>Git-flow основан на слиянии. Для слияния веток фич не используется rebase.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="setup" href="#setup">Установка</a></h2> <h2><a name="setup" href="#setup">Установка</a></h2>
<ul> <ul>
<li>В первую очередь вам нужна рабочая установка git</li> <li>В первую очередь вам нужна рабочая установка git</li>
@ -120,49 +182,55 @@
<div class="col-1"> <div class="col-1">
<h3>macOS</h3> <h3>macOS</h3>
<span>Homebrew</span> <span>Homebrew</span>
<blockquote> <blockquote>$ brew install git-flow-avh</blockquote>
$ brew install git-flow-avh
</blockquote>
<span>Macports</span> <span>Macports</span>
<blockquote> <blockquote>$ port install git-flow-avh</blockquote>
$ port install git-flow-avh
</blockquote>
<h3>Linux</h3> <h3>Linux</h3>
<blockquote> <blockquote>$ apt-get install git-flow</blockquote>
$ apt-get install git-flow
</blockquote>
<h3>Windows (Cygwin)</h3> <h3>Windows (Cygwin)</h3>
<blockquote> <blockquote>
$ wget -q -O - --no-check-certificate $ wget -q -O - --no-check-certificate
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
install stable | bash
</blockquote> </blockquote>
<p>Вам потребуется wget и util-linux для установки git-flow.</p> <p>Вам потребуется wget и util-linux для установки git-flow.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <p>
Подробные инструкции по установке git flow смотрите на <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git flow Подробные инструкции по установке git flow смотрите на
wiki</a>. <a
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
>git flow wiki</a
>.
</p> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow" />
</div>
</div> </div>
</div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">Приступая к работе</a></h2> <h2>
<p>Git flow нужно инициализировать, чтобы настроить его для работы с вашим проектом.</p> <a name="getting_started" href="#getting_started"
>Приступая к работе</a
>
</h2>
<p>
Git flow нужно инициализировать, чтобы настроить его для работы с
вашим проектом.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Инициализация</h3> <h3>Инициализация</h3>
<p>Для начала использования git-flow проинициализируйте его внутри существующего git-репозитория:</p>
<blockquote>
git flow init
</blockquote>
<p> <p>
Вам придётся ответить на несколько вопросов о способах именования ваших веток.<br/> Для начала использования git-flow проинициализируйте его внутри
существующего git-репозитория:
</p>
<blockquote>git flow init</blockquote>
<p>
Вам придётся ответить на несколько вопросов о способах именования
ваших веток.<br />
Рекомендуется оставить значения по умолчанию. Рекомендуется оставить значения по умолчанию.
</p> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="initialize"></div> <div class="initialize"></div>
@ -170,10 +238,9 @@
<div class="lines-open"></div> <div class="lines-open"></div>
<div class="lines-big"></div> <div class="lines-big"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="features" href="#features">Фичи</a></h2> <h2><a name="features" href="#features">Фичи</a></h2>
<ul class="narrow"> <ul class="narrow">
@ -186,10 +253,11 @@
<h3>Начало новой фичи</h3> <h3>Начало новой фичи</h3>
<p>Разработка новых фич начинается из ветки "develop".</p> <p>Разработка новых фич начинается из ветки "develop".</p>
<p>Для начала разработки фичи выполните:</p> <p>Для начала разработки фичи выполните:</p>
<blockquote> <blockquote>git flow feature start MYFEATURE</blockquote>
git flow feature start MYFEATURE <p>
</blockquote> Это действие создаёт новую ветку фичи, основанную на ветке
<p>Это действие создаёт новую ветку фичи, основанную на ветке "develop", и переключается на неё.</p> "develop", и переключается на неё.
</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -200,225 +268,258 @@
--> --></div>
</div>
<div class="col-2"> <div class="col-2">
<div class="feature-start"></div> <div class="feature-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Завершение фичи</h3> <h3>Завершение фичи</h3>
<p> <p>Окончание разработки фичи. Это действие выполняется так:</p>
Окончание разработки фичи.
Это действие выполняется так:
</p>
<ul> <ul>
<li>Слияние ветки MYFEATURE в "develop"</li> <li>Слияние ветки MYFEATURE в "develop"</li>
<li>Удаление ветки фичи</li> <li>Удаление ветки фичи</li>
<li>Переключение обратно на ветку "develop"</li> <li>Переключение обратно на ветку "develop"</li>
</ul> </ul>
<blockquote> <blockquote>git flow feature finish MYFEATURE</blockquote>
git flow feature finish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-end"></div> <div class="feature-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Публикация фичи</h3> <h3>Публикация фичи</h3>
<p> <p>
Вы разрабатываете фичу совместно с коллегами? <br/> Вы разрабатываете фичу совместно с коллегами? <br />
Опубликуйте фичу на удалённом сервере, чтобы её могли использовать другие пользователи. Опубликуйте фичу на удалённом сервере, чтобы её могли использовать
другие пользователи.
</p> </p>
<blockquote> <blockquote>git flow feature publish MYFEATURE</blockquote>
git flow feature publish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-publish"></div> <div class="feature-publish"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Получение опубликованной фичи</h3> <h3>Получение опубликованной фичи</h3>
<p>Получение фичи, опубликованной другим пользователем.</p>
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
<p> <p>
Получение фичи, опубликованной другим пользователем. Вы можете отслеживать фичу в репозитории origin с помощью команды
<code> git flow feature track MYFEATURE</code>
</p> </p>
<blockquote>
git flow feature pull origin MYFEATURE
</blockquote>
<p>Вы можете отслеживать фичу в репозитории origin с помощью команды <code> git flow feature track MYFEATURE</code></p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="release" href="#release">Создание релиза</a></h2> <h2><a name="release" href="#release">Создание релиза</a></h2>
<ul> <ul>
<li>Поддержка подготовки нового релиза продукта</li> <li>Поддержка подготовки нового релиза продукта</li>
<li>Позволяет устранять мелкие баги и подготавливать различные метаданные для релиза</li> <li>
Позволяет устранять мелкие баги и подготавливать различные
метаданные для релиза
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Начало релиза</h3> <h3>Начало релиза</h3>
<p>Для начала работы над релизом используйте команду <code>git flow release</code> <p>
Для начала работы над релизом используйте команду
<code>git flow release</code>
Она создаёт ветку релиза, ответляя от ветки "develop". Она создаёт ветку релиза, ответляя от ветки "develop".
</p> </p>
<blockquote> <blockquote>git flow release start RELEASE [BASE]</blockquote>
git flow release start RELEASE [BASE] <p>
</blockquote> При желании вы можете указать <code>[BASE]</code>-коммит в виде его
<p>При желании вы можете указать <code>[BASE]</code>-коммит в виде его хеша sha-1, чтобы начать релиз с него. хеша sha-1, чтобы начать релиз с него. Этот коммит должен
Этот коммит должен принадлежать ветке "develop".</p> принадлежать ветке "develop".
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>Желательно сразу публиковать ветку релиза после создания, чтобы позволить другим разработчиками выполнять коммиты в ветку релиза. <p>
          Это делается так же, как и при публикации фичи, с помощью команды:</p> Желательно сразу публиковать ветку релиза после создания, чтобы
<blockquote> позволить другим разработчиками выполнять коммиты в ветку релиза.
git flow release publish RELEASE           Это делается так же, как и при публикации фичи, с помощью
</blockquote> команды:
<p>Вы также можете отслеживать удалённый релиз с помощью команды <br/><code>git flow release track RELEASE</code></p> </p>
<blockquote>git flow release publish RELEASE</blockquote>
<p>
Вы также можете отслеживать удалённый релиз с помощью команды
<br /><code>git flow release track RELEASE</code>
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Завершение релиза</h3> <h3>Завершение релиза</h3>
<p>Завершение релиза — один из самых больших шагов в git-ветвлени. При этом происходит несколько действий:</p> <p>
Завершение релиза — один из самых больших шагов в git-ветвлени. При
этом происходит несколько действий:
</p>
<ul> <ul>
<li>Ветка релиза сливается в ветку "master"</li> <li>Ветка релиза сливается в ветку "master"</li>
<li>Релиз помечается тегом равным его имени</li> <li>Релиз помечается тегом равным его имени</li>
<li>Ветка релиза сливается обратно в ветку "develop"</li> <li>Ветка релиза сливается обратно в ветку "develop"</li>
<li>Ветка релиза удаляется</li> <li>Ветка релиза удаляется</li>
</ul> </ul>
<blockquote> <blockquote>git flow release finish RELEASE</blockquote>
git flow release finish RELEASE <p>
</blockquote> Не забудьте отправить изменения в тегах с помощью команды
<p>Не забудьте отправить изменения в тегах с помощью команды <code>git push --tags</code></p> <code>git push --tags</code>
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-end"></div> <div class="release-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">Исправления</a></h2> <h2><a name="hotfixes" href="#hotfixes">Исправления</a></h2>
<ul> <ul>
<li>Исправления нужны в том случае, когда нужно незамедлительно устранить нежелательное состояние продакшн-версии продукта</li> <li>
<li>Может ответвляться от соответствующего тега на ветке "master", который отмечает выпуск продакшн-версии</li> Исправления нужны в том случае, когда нужно незамедлительно
устранить нежелательное состояние продакшн-версии продукта
</li>
<li>
Может ответвляться от соответствующего тега на ветке "master",
который отмечает выпуск продакшн-версии
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>git flow hotfix start</h3> <h3>git flow hotfix start</h3>
<p>Как и в случае с другими командами git flow, работа над исправлением начинается так:</p> <p>
<blockquote> Как и в случае с другими командами git flow, работа над исправлением
git flow hotfix start VERSION [BASENAME] начинается так:
</blockquote> </p>
<blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
<p>Аргумент VERSION определяет имя нового, исправленного релиза.</p> <p>Аргумент VERSION определяет имя нового, исправленного релиза.</p>
<p>При желании можно указать BASENAME-коммит, от которого произойдёт ответвление.</p> <p>
При желании можно указать BASENAME-коммит, от которого произойдёт
ответвление.
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Завершение исправления</h3> <h3>Завершение исправления</h3>
<p>Когда исправление готово, оно сливается обратно в ветки "develop" и "master". <p>
Кроме того, коммит в ветке "master" помечается тегом с версией исправления.</p> Когда исправление готово, оно сливается обратно в ветки "develop" и
<blockquote> "master". Кроме того, коммит в ветке "master" помечается тегом с
git flow hotfix finish VERSION версией исправления.
</blockquote> </p>
<blockquote>git flow hotfix finish VERSION</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-end"></div> <div class="hotfix-end"></div>
</div> </div>
</div> </div>
<div> <div>
<div class="col-1"></div> <div class="col-1"></div>
<div class="col-2"> <div class="col-2">
<div class="lines-close"></div> <div class="lines-close"></div>
<div class="lines-small-end"></div> <div class="lines-small-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="commands" href="#commands">Команды</a></h2> <h2><a name="commands" href="#commands">Команды</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands" />
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Последние замечания</h2> <h2>Последние замечания</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Здесь описаны не все доступные команды, только наиболее важные</li> <li>
<li>Вы можете продолжать использовать git и все его команды, как обычно, git flow — это просто набор дополнительных инструментов</li> Здесь описаны не все доступные команды, только наиболее важные
<li>Возможности "support"-веток пока в beta-версии, использовать их не рекомендуется</li> </li>
<li>
Вы можете продолжать использовать git и все его команды, как обычно,
git flow — это просто набор дополнительных инструментов
</li>
<li>
Возможности "support"-веток пока в beta-версии, использовать их не
рекомендуется
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Презентация Git Flow</h2> <h2>Презентация Git Flow</h2>
<iframe src="https://docs.google.com/presentation/d/e/2PACX-1vTNxQcM4AkxZq0mK0lKy7-xscrYPPCUByX1y6tcOPvR--Buph2gxxFsIuyRMArGTw/embed?start=false&loop=false&delayms=5000" frameborder="0" width="960" height="569" allowfullscreen="true" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe> <iframe
</div> src="https://docs.google.com/presentation/d/e/2PACX-1vTNxQcM4AkxZq0mK0lKy7-xscrYPPCUByX1y6tcOPvR--Buph2gxxFsIuyRMArGTw/embed?start=false&loop=false&delayms=5000"
frameborder="0"
width="960"
height="569"
allowfullscreen="true"
mozallowfullscreen="true"
webkitallowfullscreen="true"
></iframe>
</div>
</div>
</div> <footer>
<footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Комментарии</a></h2> <h2><a name="comments" href="#comments">Комментарии</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>
</footer> </footer>
<script type="text/javascript"> <script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */ /* * * DON'T EDIT BELOW THIS LINE * * */
(function () { (function () {
var dsq = document.createElement('script'); var dsq = document.createElement("script");
dsq.type = 'text/javascript'; dsq.type = "text/javascript";
dsq.async = true; dsq.async = true;
dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js'; dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); (
document.getElementsByTagName("head")[0] ||
document.getElementsByTagName("body")[0]
).appendChild(dsq);
})(); })();
</script> </script>
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a> <noscript
</noscript> >Please enable JavaScript to view the
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a> <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
</noscript>
<a href="http://disqus.com" class="dsq-brlink"
</body> >comments powered by <span class="logo-disqus">Disqus</span></a
>
</body>
</html> </html>

516
index.tr_TR.html
View File

@ -1,169 +1,226 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="tr" xmlns="http://www.w3.org/1999/html"> <html lang="tr" xmlns="http://www.w3.org/1999/html">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>git-flow cheatsheet</title> <title>git-flow cheatsheet</title>
<link href='https://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'> <link
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print"> href="https://fonts.googleapis.com/css?family=Sansita+One"
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print"> 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 type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-33766650-1']); _gaq.push(["_setAccount", "UA-33766650-1"]);
_gaq.push(['_trackPageview']); _gaq.push(["_trackPageview"]);
(function () { (function () {
var ga = document.createElement('script'); var ga = document.createElement("script");
ga.type = 'text/javascript'; ga.type = "text/javascript";
ga.async = true; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; ga.src =
var s = document.getElementsByTagName('script')[0]; ("https:" == document.location.protocol
? "https://ssl"
: "http://www") + ".google-analytics.com/ga.js";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(ga, s); s.parentNode.insertBefore(ga, s);
})(); })();
</script> </script>
</head> </head>
<body> <body>
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div> <div id="banner">
<header> <a href="https://github.com/danielkummer/git-flow-cheatsheet"
>Fork me on GitHub</a
>
</div>
<header>
<h1 id="title">git-flow cheatsheet</h1> <h1 id="title">git-flow cheatsheet</h1>
<p id="author"> <p id="author">
Tasarlayan: <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> 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> <a
<script>!function (d, s, id) { href="https://twitter.com/share"
var js, fjs = d.getElementsByTagName(s)[0]; 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)) { if (!d.getElementById(id)) {
js = d.createElement(s); js = d.createElement(s);
js.id = id; js.id = id;
js.src = "//platform.twitter.com/widgets.js"; js.src = "//platform.twitter.com/widgets.js";
fjs.parentNode.insertBefore(js, fjs); fjs.parentNode.insertBefore(js, fjs);
} }
}(document, "script", "twitter-wjs");</script> })(document, "script", "twitter-wjs");
</script>
</p> </p>
<p id="desc"><a href="http://nvie.com/">Vincent Driessen</a>'ın verimli dallanma modeli kullanılarak tasarlanmıştır.</p> <p id="desc">
<p id="translations">çeviriler: <a href="http://nvie.com/">Vincent Driessen</a>'ın verimli dallanma
<a href="index.html" title="english">English</a> - 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.es_ES.html" title="spanish">Castellano</a> -
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> - <a href="index.pt_BR.html" title="Brazilian Portugues"
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - >Brazilian Portugues</a
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - >
<a href="index.ja_JP.html" title="日本語">日本語</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="#" class="active" title="Turkce">Türkçe</a> -
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</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.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</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.de_DE.html" title="German">Deutsch (German)</a> -
<a href="index.ca_CA.html" title="Català">Català (Catalan)</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.ro_RO.html" title="Romanian">Română (Romanian)</a> -
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> - <a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
<a href="index.uk_UA.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.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
<a href="index.pl_PL.html" title="Polish">Polski</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.ar_MA.html" title="العربية">العربية</a> - <a href="index.ar_MA.html" title="العربية">العربية</a> -
<a href="index.fa_FA.html" title="فارسی">فارسی</a> - <a href="index.fa_FA.html" title="فارسی">فارسی</a> -
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a> <a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a> <a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
</p> </p>
</header> </header>
<div id="main"> <div id="main">
<div class="scrollblock">
<div class="scrollblock">
<h2>Hakkında</h2> <h2>Hakkında</h2>
<p> <p>
git-flow, Vincent Driessen'in dallanma modeli için geliştirilmiş, git repoları için üst düzey işlemler git-flow, Vincent Driessen'in dallanma modeli için geliştirilmiş, git
yapabilmenizi sağlayan, sözkonusu dallanma modelini kullanmayı oldukça kolaylaştıran git eklentilerini içerir. repoları için üst düzey işlemler yapabilmenizi sağlayan, sözkonusu
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/"><br>Vincent Driessen'in dallanma modeli hakkında</a></small> 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>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>Bu döküman git flow işlemleri hakkında temel kullanım şekillerini içermektedir.</p> <p>
Bu döküman git flow işlemleri hakkında temel kullanım şekillerini
içermektedir.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Temel Ipuçları</h2> <h2>Temel Ipuçları</h2>
<ul> <ul>
<li>Git flow komut satırları ile kusursuz yardım (help) ve çıktı (output) sağlar.</li> <li>
<li>macOS ve Windows kullanıcıları için <a href="http://www.sourcetreeapp.com/">Sourcetree</a> , git flowa destek Git flow komut satırları ile kusursuz yardım (help) ve çıktı
veren mükemmel bir git gui aracıdır. (output) sağlar.
</li>
<li>
macOS 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> </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> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="setup" href="#setup">Ayarlar</a></h2> <h2><a name="setup" href="#setup">Ayarlar</a></h2>
<ul> <ul>
<li>Git flow'u kullanabilmek için öncelikli olarak git kurulumunun yapılması gerekmektedir.</li> <li>
Git flow'u kullanabilmek için öncelikli olarak git kurulumunun
yapılması gerekmektedir.
</li>
<li>Git flow macOS, Linux ve Windows üzerinde çalıştırılabilir.</li> <li>Git flow macOS, Linux ve Windows üzerinde çalıştırılabilir.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>macOS</h3> <h3>macOS</h3>
<span>Homebrew</span> <span>Homebrew</span>
<blockquote> <blockquote>$ brew install git-flow-avh</blockquote>
$ brew install git-flow-avh
</blockquote>
<span>Macports</span> <span>Macports</span>
<blockquote> <blockquote>$ port install git-flow-avh</blockquote>
$ port install git-flow-avh
</blockquote>
<h3>Linux</h3> <h3>Linux</h3>
<blockquote> <blockquote>$ apt-get install git-flow</blockquote>
$ apt-get install git-flow
</blockquote>
<h3>Windows (Cygwin)</h3> <h3>Windows (Cygwin)</h3>
<blockquote> <blockquote>
$ wget -q -O - --no-check-certificate $ wget -q -O - --no-check-certificate
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
install stable | bash
</blockquote> </blockquote>
<p>Git flow kurulumu için wget ve util-linux gerekmektedir.</p> <p>Git flow kurulumu için wget ve util-linux gerekmektedir.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <p>
Git-flow kurulumu hakkında detaylı bilgi için git flow wiki'yi 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 ziyaret edebilirsiniz.<a
wiki</a>. href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
>git flow wiki</a
>.
</p> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow" />
</div>
</div> </div>
</div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">Baslarken</a></h2> <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>
Git flow, kullanmak istediğiniz projede ayarlarınızı özelleştirmek
amacıyla başlatılır (initialize).
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Başlangıç (Initialize)</h3> <h3>Başlangıç (Initialize)</h3>
<p>git flow'u kullanmak istediğiniz reponuzdayken; <p>git flow'u kullanmak istediğiniz reponuzdayken;</p>
</p> <blockquote>git flow init</blockquote>
<blockquote> <p>komutuyla başlatabilirsiniz.</p>
git flow init
</blockquote>
<p>komutuyla başlatabilirsiniz.
</p>
<p> <p>
Bu noktada kafanızda dallarınızı (branches) isimlendirme konusuna ilişkin birçok soru işareti oluşacaktır. Bu noktada kafanızda dallarınızı (branches) isimlendirme konusuna
Bu bağlamda varsayılan (default) değerleri kullanmanız önerilir. ilişkin birçok soru işareti oluşacaktır. Bu bağlamda varsayılan
(default) değerleri kullanmanız önerilir.
</p> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="initialize"></div> <div class="initialize"></div>
@ -171,29 +228,33 @@
<div class="lines-open"></div> <div class="lines-open"></div>
<div class="lines-big"></div> <div class="lines-big"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="features" href="#features">Özellikler (Features)</a></h2> <h2><a name="features" href="#features">Özellikler (Features)</a></h2>
<ul class="narrow"> <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>
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> <li>Genel olarak sadece geliştirici repolarında bulunurlar.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Yeni bir özellik eklemesi başlatmak </h3> <h3>Yeni bir özellik eklemesi başlatmak</h3>
<h3>(feature start)</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> <p>
ile başlarız. Bu komut bize develop dalını (branch) temel alan bir özellik dalı (feature) oluşturur. Yeni özelliklerin eklenmesi öncelikle develop dalından (branch)
Ve bulunduğumuz dalı feature/MYFEATURE olarak değiştirir. 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> </p>
<!-- <!--
@ -205,252 +266,275 @@
--> --></div>
</div>
<div class="col-2"> <div class="col-2">
<div class="feature-start"></div> <div class="feature-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Bir özellik eklemesi bitirilirken (feature finish)</h3> <h3>Bir özellik eklemesi bitirilirken (feature finish)</h3>
<p> <p>Bir özelliğin eklenme işlemi bitirilirken şunları yapılır:</p>
Bir özelliğin eklenme işlemi bitirilirken şunları yapılır:
</p>
<ul> <ul>
<li>Kendi çalıştığımız özellik dalı (burada MYFEATURE) develop ana dalı ile birleştirilir.</li> <li>
<li>Bu birleşmeden sonra kendi özellik dalımız (MYFEATURE) silinir.</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> <li>Bulunduğumuz dal tekrar develop olarak değiştirilir.</li>
</ul> </ul>
<blockquote> <blockquote>git flow feature finish MYFEATURE</blockquote>
git flow feature finish MYFEATURE <p>bu işlemleri bizler için yapar.</p>
</blockquote>
<p>
bu işlemleri bizler için yapar.
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-end"></div> <div class="feature-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Bir özelliği yayınlamak</h3> <h3>Bir özelliği yayınlamak</h3>
<h3> (Publish a feature)</h3> <h3>(Publish a feature)</h3>
<p> <p>
Bir ekip içerisinde geliştirme mi yapıyorsunuz ? <br/> Bir ekip içerisinde geliştirme mi yapıyorsunuz ? <br />
O zaman geliştirdiğiniz özelliği bir uzak sunucuya gönderin, 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 ; böylelikle geliştirdiğiniz özellik diğer kullanıcılar tarafından
kullanılabilir.Öyleyse ;
</p> </p>
<blockquote> <blockquote>git flow feature publish MYFEATURE</blockquote>
git flow feature publish MYFEATURE <p>sizin için bu işi halledebilir.</p>
</blockquote>
<p>
sizin için bu işi halledebilir.
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-publish"></div> <div class="feature-publish"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Yayınlanmış bir özelliği almak (Getting a published feature)</h3> <h3>Yayınlanmış bir özelliği almak (Getting a published feature)</h3>
<p> <p>
Uzak sunucu üzerinde yayınlanmış bir özelliği kendi yerel (local) çalışma ortamınıza aktarırken: Uzak sunucu üzerinde yayınlanmış bir özelliği kendi yerel (local)
çalışma ortamınıza aktarırken:
</p> </p>
<blockquote> <blockquote>git flow feature pull MYFEATURE</blockquote>
git flow feature pull MYFEATURE <p>size yardımcı olacaktır.</p>
</blockquote>
<p>
size yardımcı olacaktır.
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock"> <h2>
<h2><a name="release" href="#release">Bir yayın çıkarırken (release)</a></h2> <a name="release" href="#release">Bir yayın çıkarırken (release)</a>
</h2>
<ul> <ul>
<li>Yeni bir ürünün yayınlanmasına yardımcı olur.</li> <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> <li>
Küçük hata giderimleri ve meta-data hazırlığı için kullanılabilir.
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Bir sürüm yayınlamak</h3> <h3>Bir sürüm yayınlamak</h3>
<h3>(Start a release)</h3> <h3>(Start a release)</h3>
<p>Yayınlamaya başlamak için,</p>
<p>Yayınlamaya başlamak için, <blockquote>git flow release start RELEASE [BASE]</blockquote>
<blockquote>
git flow release start RELEASE [BASE]
</blockquote>
<p> <p>
komutu kullanılır.Bu komut ile develop dalını temel kabul eden bir release dalı (branch) yaratılır. 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>
<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">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</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 <p>
commitlerinin de kabul edilmesini sağlayabilirsiniz. Bunu özellik yayınlama (feature publishing) ile kolaylıkla yapabilirsiniz. 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> </p>
<blockquote> <blockquote>git flow release publish RELEASE</blockquote>
git flow release publish RELEASE <p>
</blockquote> (Uzak sunucu üzerindeki yayınları <br />
<p>(Uzak sunucu üzerindeki yayınları <br/>
<code>git flow release track RELEASE</code> <code>git flow release track RELEASE</code>
<br>ile izleyebilirsiniz. )</p> <br />ile izleyebilirsiniz. )
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Bir sürüm yayınını tamamlamak</h3> <h3>Bir sürüm yayınını tamamlamak</h3>
<h3>(Finish up a release)</h3> <h3>(Finish up a release)</h3>
<p> <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: 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> </p>
<ul> <ul>
<li>Yayınlama yaptığımız dal olan release dalı (branch) master ana dalı ile birleştirilir.</li> <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>Etiketler (tags) isimleri ile birlikte yayınlanır.</li>
<li>Arkaplandaki birleştirmeler (back-merges) develop dalında 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> <li>Yayınlama için açmış olduğumuz dal (branch) silinir.</li>
</ul> </ul>
<blockquote> <blockquote>git flow release finish RELEASE</blockquote>
git flow release finish RELEASE
</blockquote>
<p> <p>
sizler için bu işlemleri halledecektir. Ancak etiketlerinizi de eklemeyi unutmayın! sizler için bu işlemleri halledecektir. Ancak etiketlerinizi de
eklemeyi unutmayın!
<code>git push --tags</code> bu sorununuzu da halledecektir. <code>git push --tags</code> bu sorununuzu da halledecektir.
</p> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-end"></div> <div class="release-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">Hata giderimleri (Hotfixes)</a></h2> <h2>
<a name="hotfixes" href="#hotfixes">Hata giderimleri (Hotfixes)</a>
</h2>
<ul> <ul>
<li>Yayına çıkarılmış bir versiyonda istenmeyen durumlar ortaya çıktığında ani hata giderimi için kullanılır. <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> </li>
<li>Hotfixler, master ana dalı (branch)ındaki versiyon numarasını belirten etiketten dallanır (branching).</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Bir hata giderimini başlatmak</h3> <h3>Bir hata giderimini başlatmak</h3>
<h3> (git flow hotfix start)</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> <p>
komutu kullanılır. Diğer git flow komutlarında olduğu gibi bir hotfix başlatılırken :
</p>
Versiyon argümanları yeni hotfix yayınının adını alır. Opsiyonel olarak <blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
başlangıç noktası için bir isim özelleştirmesi yapabilirsiniz (basename).</p> <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>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Hata giderimi bitirme</h3> <h3>Hata giderimi bitirme</h3>
<h3>(Finish a hotfix)</h3> <h3>(Finish a hotfix)</h3>
<p>Bir hata giderimi tamamlanırken, develop ve master dalları ile birleştirilir. <p>
Ayrıca master dalına (branch) hotfix versiyonunun etiketi eklenir.</p> Bir hata giderimi tamamlanırken, develop ve master dalları ile
<blockquote> birleştirilir. Ayrıca master dalına (branch) hotfix versiyonunun
git flow hotfix finish VERSION etiketi eklenir.
</blockquote> </p>
<blockquote>git flow hotfix finish VERSION</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-end"></div> <div class="hotfix-end"></div>
</div> </div>
</div> </div>
<div> <div>
<div class="col-1"></div> <div class="col-1"></div>
<div class="col-2"> <div class="col-2">
<div class="lines-close"></div> <div class="lines-close"></div>
<div class="lines-small-end"></div> <div class="lines-small-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="commands" href="#commands">Komutlar (Commands)</a></h2> <h2><a name="commands" href="#commands">Komutlar (Commands)</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands" />
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Içerik bilgisi (Backlog)</h2> <h2>Içerik bilgisi (Backlog)</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Bu dökümanda Git flow için en önemli komutlar ve kullanımları ile ilgili bilgiler verilmektedir. <li>
Ancak tüm Git flow komutları burda bahsedilenlerle sınırlı değildir.</li> Bu dökümanda Git flow için en önemli komutlar ve kullanımları ile
<li>Git flow kullanırken git ve gite ait diğer alt komutları gönlünüzce kullanabilirsiniz. ilgili bilgiler verilmektedir. Ancak tüm Git flow komutları burda
Git flow sadece bir repo derleme-toplama aracıdır. 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> </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> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
</div> </div>
<footer>
<footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Yorumlar (Comments)</a></h2> <h2><a name="comments" href="#comments">Yorumlar (Comments)</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>
</footer> </footer>
<script type="text/javascript"> <script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */ /* * * DON'T EDIT BELOW THIS LINE * * */
(function () { (function () {
var dsq = document.createElement('script'); var dsq = document.createElement("script");
dsq.type = 'text/javascript'; dsq.type = "text/javascript";
dsq.async = true; dsq.async = true;
dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js'; dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); (
document.getElementsByTagName("head")[0] ||
document.getElementsByTagName("body")[0]
).appendChild(dsq);
})(); })();
</script> </script>
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a> <noscript
</noscript> >Please enable JavaScript to view the
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a> <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
</noscript>
<a href="http://disqus.com" class="dsq-brlink"
</body> >comments powered by <span class="logo-disqus">Disqus</span></a
>
</body>
</html> </html>

381
index.uk_UA.html
View File

@ -1,95 +1,145 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="uk" xmlns="http://www.w3.org/1999/html"> <html lang="uk" xmlns="http://www.w3.org/1999/html">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title>Шпаргалка по git-flow</title> <title>Шпаргалка по git-flow</title>
<!-- Lobster is same as Sansita but with cyrillic and another subsets. I recomend to use Lobster instead Sansita everywere--> <!-- Lobster is same as Sansita but with cyrillic and another subsets. I recomend to use Lobster instead Sansita everywere-->
<link href='https://fonts.googleapis.com/css?family=Lobster&subset=latin,cyrillic' rel='stylesheet' type='text/css'> <link
href="https://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
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print"> 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> <style>
.title, h1, h2, h2 a, h3 { .title,
font-family: 'Lobster'; h1,
h2,
h2 a,
h3 {
font-family: "Lobster";
} }
</style> </style>
<script type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-33766650-1']); _gaq.push(["_setAccount", "UA-33766650-1"]);
_gaq.push(['_trackPageview']); _gaq.push(["_trackPageview"]);
(function () { (function () {
var ga = document.createElement('script'); var ga = document.createElement("script");
ga.type = 'text/javascript'; ga.type = "text/javascript";
ga.async = true; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; ga.src =
var s = document.getElementsByTagName('script')[0]; ("https:" == document.location.protocol
? "https://ssl"
: "http://www") + ".google-analytics.com/ga.js";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(ga, s); s.parentNode.insertBefore(ga, s);
})(); })();
</script> </script>
</head> </head>
<body> <body>
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div> <div id="banner">
<header> <a href="https://github.com/danielkummer/git-flow-cheatsheet"
>Fork me on GitHub</a
>
</div>
<header>
<h1 id="title">Шпаргалка по git-flow</h1> <h1 id="title">Шпаргалка по git-flow</h1>
<p id="author"> <p id="author">
автор <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> автор <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> <a
<script>!function (d, s, id) { href="https://twitter.com/share"
var js, fjs = d.getElementsByTagName(s)[0]; 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)) { if (!d.getElementById(id)) {
js = d.createElement(s); js = d.createElement(s);
js.id = id; js.id = id;
js.src = "//platform.twitter.com/widgets.js"; js.src = "//platform.twitter.com/widgets.js";
fjs.parentNode.insertBefore(js, fjs); fjs.parentNode.insertBefore(js, fjs);
} }
}(document, "script", "twitter-wjs");</script> })(document, "script", "twitter-wjs");
</script>
</p> </p>
<p id="desc">ефективне розгалуження з допомогою git-flow від <a href="http://nvie.com/">Vincent Driessen</a></p> <p id="desc">
<p id="translations">переклади: ефективне розгалуження з допомогою git-flow від
<a href="index.html" title="english">English</a> - <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.es_ES.html" title="spanish">Castellano</a> -
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> - <a href="index.pt_BR.html" title="Brazilian Portugues"
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - >Brazilian Portugues</a
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - >
<a href="index.ja_JP.html" title="日本語">日本語</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.tr_TR.html" title="Turkce">Türkçe</a> -
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</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.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</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.de_DE.html" title="German">Deutsch (German)</a> -
<a href="index.ca_CA.html" title="Català">Català (Catalan)</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.ro_RO.html" title="Romanian">Română (Romanian)</a> -
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</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="#" class="active" title="Ukrainian">Українська (Ukrainian)</a>
<a href="index.pl_PL.html" title="Polish">Polski</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.ar_MA.html" title="العربية">العربية</a> - <a href="index.ar_MA.html" title="العربية">العربية</a> -
<a href="index.fa_FA.html" title="فارسی">فارسی</a> - <a href="index.fa_FA.html" title="فارسی">فارسی</a> -
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a> <a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a> <a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
</p> </p>
</header> </header>
<div id="main">
<div id="main">
<div class="scrollblock"> <div class="scrollblock">
<h2>Вступ</h2> <h2>Вступ</h2>
<p> <p>
git-flow — це набір розширень git, який надає доступ до високорівневих операцій над репозиторієм згідно з моделлю розгалуження Vincent git-flow — це набір розширень git, який надає доступ до високорівневих
операцій над репозиторієм згідно з моделлю розгалуження Vincent
Driessen. Driessen.
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">дізнатися більше</a></small> <small
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
>дізнатися більше</a
></small
>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
@ -101,15 +151,23 @@
<div class="scrollblock"> <div class="scrollblock">
<h2>Загальні поради</h2> <h2>Загальні поради</h2>
<ul> <ul>
<li>Git-flow забезпечує чудову довідку і виведення в командному рядку. Читайте уважно, щоб розуміти, що відбувається...</li> <li>
<li>Клієнт для OSX/Windows <a href="http://www.sourcetreeapp.com/">Sourcetree</a> — чудовий GUI для Git, який також підтримує git-flow Git-flow забезпечує чудову довідку і виведення в командному рядку.
Читайте уважно, щоб розуміти, що відбувається...
</li>
<li>
Клієнт для OSX/Windows
<a href="http://www.sourcetreeapp.com/">Sourcetree</a> — чудовий GUI
для Git, який також підтримує git-flow
</li>
<li>
Git-flow заснований на злитті. Для злиття гілок нововведень не
використовується rebase.
</li> </li>
<li>Git-flow заснований на злитті. Для злиття гілок нововведень не використовується rebase.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="setup" href="#setup">Встановлення</a></h2> <h2><a name="setup" href="#setup">Встановлення</a></h2>
<ul> <ul>
@ -120,49 +178,52 @@
<div class="col-1"> <div class="col-1">
<h3>macOS</h3> <h3>macOS</h3>
<span>Homebrew</span> <span>Homebrew</span>
<blockquote> <blockquote>$ brew install git-flow-avh</blockquote>
$ brew install git-flow-avh
</blockquote>
<span>Macports</span> <span>Macports</span>
<blockquote> <blockquote>$ port install git-flow-avh</blockquote>
$ port install git-flow-avh
</blockquote>
<h3>Linux</h3> <h3>Linux</h3>
<blockquote> <blockquote>$ apt-get install git-flow</blockquote>
$ apt-get install git-flow
</blockquote>
<h3>Windows (Cygwin)</h3> <h3>Windows (Cygwin)</h3>
<blockquote> <blockquote>
$ wget -q -O - --no-check-certificate $ wget -q -O - --no-check-certificate
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
install stable | bash
</blockquote> </blockquote>
<p>Вам знадобиться wget і util-linux для встановлення git-flow.</p> <p>Вам знадобиться wget і util-linux для встановлення git-flow.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <p>
Для більш детальної інформації щодо встановлення git-flow відвідайте <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation">git-flow Для більш детальної інформації щодо встановлення git-flow відвідайте
wiki</a>. <a
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
>git-flow wiki</a
>.
</p> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow" />
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">Початок роботи</a></h2> <h2>
<p>Git-flow порібно ініціалізувати, щоб налаштувати його для роботи з вашим репозиторієм.</p> <a name="getting_started" href="#getting_started">Початок роботи</a>
</h2>
<p>
Git-flow порібно ініціалізувати, щоб налаштувати його для роботи з
вашим репозиторієм.
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Ініціалізація</h3> <h3>Ініціалізація</h3>
<p>Щоб почати використовувати git-flow, ініціалізуйте його в існуючому репозиторії:</p>
<blockquote>
git flow init
</blockquote>
<p> <p>
Дайте відповідь на запитання щодо назв ваших гілок.<br/> Щоб почати використовувати git-flow, ініціалізуйте його в існуючому
репозиторії:
</p>
<blockquote>git flow init</blockquote>
<p>
Дайте відповідь на запитання щодо назв ваших гілок.<br />
Рекомендується залишити значення за замовчуванням. Рекомендується залишити значення за замовчуванням.
</p> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="initialize"></div> <div class="initialize"></div>
@ -172,7 +233,6 @@
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="features" href="#features">Фічі</a></h2> <h2><a name="features" href="#features">Фічі</a></h2>
@ -184,12 +244,15 @@
<div class="col-1"> <div class="col-1">
<h3>Початок нововведення</h3> <h3>Початок нововведення</h3>
<p>Розробка нововведення починається з відгалуження гілки "develop".</p> <p>
Розробка нововведення починається з відгалуження гілки "develop".
</p>
<p>Для початку розробки нововведення виконайте:</p> <p>Для початку розробки нововведення виконайте:</p>
<blockquote> <blockquote>git flow feature start MYFEATURE</blockquote>
git flow feature start MYFEATURE <p>
</blockquote> Ця дія створить нову гілку нововведення, відгалужену від гілки
<p>Ця дія створить нову гілку нововведення, відгалужену від гілки "develop", і переключиться на неї.</p> "develop", і переключиться на неї.
</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -211,19 +274,14 @@
<div class="col-1"> <div class="col-1">
<h3>Завершення нововведення</h3> <h3>Завершення нововведення</h3>
<p> <p>Завершення розробки нововведення. Ця дія виконується так:</p>
Завершення розробки нововведення.
Ця дія виконується так:
</p>
<ul> <ul>
<li>Злиття гілки MYFEATURE в "develop"</li> <li>Злиття гілки MYFEATURE в "develop"</li>
<li>Видалення гілки нововведення</li> <li>Видалення гілки нововведення</li>
<li>Переключення назад на гілку "develop"</li> <li>Переключення назад на гілку "develop"</li>
</ul> </ul>
<blockquote> <blockquote>git flow feature finish MYFEATURE</blockquote>
git flow feature finish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-end"></div> <div class="feature-end"></div>
@ -235,13 +293,12 @@
<h3>Публікація нововведення</h3> <h3>Публікація нововведення</h3>
<p> <p>
Ви розробляєте нововведення в команді? <br/> Ви розробляєте нововведення в команді? <br />
Опубулікуйте нововведення на віддаленому сервері, щоб його могли використовувати інші користувачі. Опубулікуйте нововведення на віддаленому сервері, щоб його могли
використовувати інші користувачі.
</p> </p>
<blockquote> <blockquote>git flow feature publish MYFEATURE</blockquote>
git flow feature publish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-publish"></div> <div class="feature-publish"></div>
@ -252,48 +309,56 @@
<div class="col-1"> <div class="col-1">
<h3>Отримання опублікованого нововведення</h3> <h3>Отримання опублікованого нововведення</h3>
<p>Отримання нововведення, опублікованого іншим користувачем.</p>
<blockquote>git flow feature pull origin MYFEATURE</blockquote>
<p> <p>
Отримання нововведення, опублікованого іншим користувачем. Ви можете відслідковувати нововведення в репозиторії origin з
допомогою команди <code> git flow feature track MYFEATURE</code>
</p> </p>
<blockquote>
git flow feature pull origin MYFEATURE
</blockquote>
<p>Ви можете відслідковувати нововведення в репозиторії origin з допомогою команди <code> git flow feature track MYFEATURE</code></p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="release" href="#release">Створення релізу</a></h2> <h2><a name="release" href="#release">Створення релізу</a></h2>
<ul> <ul>
<li>Забезпечується підготовка нового релізу продукту</li> <li>Забезпечується підготовка нового релізу продукту</li>
<li>Дозволяє усунути дрібні помилки і підготувати різноманітні метадані для релізу</li> <li>
Дозволяє усунути дрібні помилки і підготувати різноманітні метадані
для релізу
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Початок релізу</h3> <h3>Початок релізу</h3>
<p>Щоб почати роботу над релізом використовуйте команду <code>git flow release</code> <p>
Щоб почати роботу над релізом використовуйте команду
<code>git flow release</code>
Команда створить гілку релізу, відгалужуючись від гілки "develop". Команда створить гілку релізу, відгалужуючись від гілки "develop".
</p> </p>
<blockquote> <blockquote>git flow release start RELEASE [BASE]</blockquote>
git flow release start RELEASE [BASE] <p>
</blockquote> За потреби ви можете вказати <code>[BASE]</code>-комміт у вигляді
<p>За потреби ви можете вказати <code>[BASE]</code>-комміт у вигляді його хешу SHA-1, щоб почати реліз з нього. його хешу SHA-1, щоб почати реліз з нього. Цей комміт повинен
Цей комміт повинен належати гілці "develop".</p> належати гілці "develop".
</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>Бажано одразу публікувати гілку релізу після створення, щоб інші користувачі мали змогу виконувати комміти в гілку релізу. <p>
          Команда для публікації схожа на аналогічну команду для нововведень:</p> Бажано одразу публікувати гілку релізу після створення, щоб інші
<blockquote> користувачі мали змогу виконувати комміти в гілку релізу.          
git flow release publish RELEASE Команда для публікації схожа на аналогічну команду для нововведень:
</blockquote> </p>
<p>Віддалений реліз також можна відслідковувати за допомогою команди <br/><code>git flow release track RELEASE</code></p> <blockquote>git flow release publish RELEASE</blockquote>
<p>
Віддалений реліз також можна відслідковувати за допомогою команди
<br /><code>git flow release track RELEASE</code>
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
@ -304,22 +369,24 @@
<div class="col-1"> <div class="col-1">
<h3>Завершення релізу</h3> <h3>Завершення релізу</h3>
<p>Завершення релізу - один з найбільших кроків в git-розгалуженні. Під час цього відбувається декілька дій:</p> <p>
Завершення релізу - один з найбільших кроків в git-розгалуженні. Під
час цього відбувається декілька дій:
</p>
<ul> <ul>
<li>Злиття гілки релізу в гілку "master"</li> <li>Злиття гілки релізу в гілку "master"</li>
<li>Позначення релізу ім'ям</li> <li>Позначення релізу ім'ям</li>
<li>Злиття гілки релізу назад в гілку "develop"</li> <li>Злиття гілки релізу назад в гілку "develop"</li>
<li>Видалення гілки релізу</li> <li>Видалення гілки релізу</li>
</ul> </ul>
<blockquote> <blockquote>git flow release finish RELEASE</blockquote>
git flow release finish RELEASE <p>
</blockquote> Не забувайте відправляти зміни в тегах за допмогою команди
<p>Не забувайте відправляти зміни в тегах за допмогою команди <code>git push --tags</code></p> <code>git push --tags</code>
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-end"></div> <div class="release-end"></div>
</div> </div>
</div> </div>
@ -327,19 +394,28 @@
<h2><a name="hotfixes" href="#hotfixes">Виправлення</a></h2> <h2><a name="hotfixes" href="#hotfixes">Виправлення</a></h2>
<ul> <ul>
<li>Виправлення потрібні для усунення небажаного стану production-версії</li> <li>
<li>Може відгалужуватися від відповідного тегу на гілці "master", яким позначено випуск production-версії</li> Виправлення потрібні для усунення небажаного стану production-версії
</li>
<li>
Може відгалужуватися від відповідного тегу на гілці "master", яким
позначено випуск production-версії
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>git flow hotfix start</h3> <h3>git flow hotfix start</h3>
<p>Як і в випадку з іншими командами git-flow, робота над виправленнями починається так:</p> <p>
<blockquote> Як і в випадку з іншими командами git-flow, робота над виправленнями
git flow hotfix start VERSION [BASENAME] починається так:
</blockquote> </p>
<blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
<p>Аргумент VERSION визначає назву нового, виправленого релізу.</p> <p>Аргумент VERSION визначає назву нового, виправленого релізу.</p>
<p>За потреби можна вказати BASENAME-комміт, від якого піде відгалуження.</p> <p>
За потреби можна вказати BASENAME-комміт, від якого піде
відгалуження.
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
@ -350,11 +426,12 @@
<div class="col-1"> <div class="col-1">
<h3>Завершення виправлення</h3> <h3>Завершення виправлення</h3>
<p>Коли виправлення завершене, воно зливається назад в гілки "develop" і "master". <p>
Крім того, комміт в гілці "master" позначється тегом з версією виправлення.</p> Коли виправлення завершене, воно зливається назад в гілки "develop"
<blockquote> і "master". Крім того, комміт в гілці "master" позначється тегом з
git flow hotfix finish VERSION версією виправлення.
</blockquote> </p>
<blockquote>git flow hotfix finish VERSION</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-end"></div> <div class="hotfix-end"></div>
@ -369,10 +446,9 @@
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="commands" href="#commands">Команди</a></h2> <h2><a name="commands" href="#commands">Команди</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands" />
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
@ -380,40 +456,51 @@
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Тут описані не всі доступні команди, а тільки найважливіші</li> <li>Тут описані не всі доступні команди, а тільки найважливіші</li>
<li>Ви можете продовжувати використовувати git і всі його команди, git-flow — це тільки набір додаткових інструментів</li> <li>
<li>Можливості "support"-гілок знаходяться в beta-версії, користуватися ними не рекомендується</li> Ви можете продовжувати використовувати git і всі його команди,
git-flow — це тільки набір додаткових інструментів
</li>
<li>
Можливості "support"-гілок знаходяться в beta-версії, користуватися
ними не рекомендується
</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
</div> </div>
<footer>
<footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Коментарі</a></h2> <h2><a name="comments" href="#comments">Коментарі</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>
</footer> </footer>
<script type="text/javascript"> <script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */ /* * * DON'T EDIT BELOW THIS LINE * * */
(function () { (function () {
var dsq = document.createElement('script'); var dsq = document.createElement("script");
dsq.type = 'text/javascript'; dsq.type = "text/javascript";
dsq.async = true; dsq.async = true;
dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js'; dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); (
document.getElementsByTagName("head")[0] ||
document.getElementsByTagName("body")[0]
).appendChild(dsq);
})(); })();
</script> </script>
<noscript>Будь ласка, увімкніть JavaScript, щоб переглянути <a href="http://disqus.com/?ref_noscript">коментарі при підтримці Disqus.</a> <noscript
</noscript> >Будь ласка, увімкніть JavaScript, щоб переглянути
<a href="http://disqus.com" class="dsq-brlink">коментарі при підтримці <span class="logo-disqus">Disqus</span></a> <a href="http://disqus.com/?ref_noscript"
>коментарі при підтримці Disqus.</a
>
</body> </noscript>
<a href="http://disqus.com" class="dsq-brlink"
>коментарі при підтримці <span class="logo-disqus">Disqus</span></a
>
</body>
</html> </html>

1
index.vi_VN.html
View File

@ -55,6 +55,7 @@
<a href="index.tr_TR.html" title="Turkce">Türkçe</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.ko_KR.html" title="한국어">한국어(Korean)</a> -
<a href="index.fr_FR.html" title="Français">Français</a> - <a href="index.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> - <a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -

1
index.zh_CN.html
View File

@ -44,6 +44,7 @@
<a href="index.tr_TR.html" title="Turkce">Türkçe</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.ko_KR.html" title="한국어">한국어(Korean)</a> -
<a href="index.fr_FR.html" title="Français">Français</a> - <a href="index.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> - <a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -

400
index.zh_TW.html
View File

@ -1,96 +1,154 @@
<!doctype html> <!DOCTYPE html>
<html lang="zh-TW"> <html lang="zh-TW">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta http-equiv="x-ua-compatible" content="ie=edge"> <meta http-equiv="x-ua-compatible" content="ie=edge" />
<title>git-flow 備忘清單</title> <title>git-flow 備忘清單</title>
<link href='https://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'> <link
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print"> href="https://fonts.googleapis.com/css?family=Sansita+One"
<link rel="stylesheet" href="css/style.css" type="text/css" media="screen,print"> rel="stylesheet"
<link rel="stylesheet" href="css/style.zh_TW.css" type="text/css" media="screen,print"> 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 type="text/javascript"> <script type="text/javascript">
var _gaq = _gaq || []; var _gaq = _gaq || [];
_gaq.push(['_setAccount', 'UA-33766650-1']); _gaq.push(["_setAccount", "UA-33766650-1"]);
_gaq.push(['_trackPageview']); _gaq.push(["_trackPageview"]);
(function () { (function () {
var ga = document.createElement('script'); var ga = document.createElement("script");
ga.type = 'text/javascript'; ga.type = "text/javascript";
ga.async = true; ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; ga.src =
var s = document.getElementsByTagName('script')[0]; ("https:" == document.location.protocol
? "https://ssl"
: "http://www") + ".google-analytics.com/ga.js";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(ga, s); s.parentNode.insertBefore(ga, s);
})(); })();
</script> </script>
</head> </head>
<body> <body>
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div> <div id="banner">
<header> <a href="https://github.com/danielkummer/git-flow-cheatsheet"
>Fork me on GitHub</a
<h1 id="title" style="font-size: 80px;">git-flow 備忘清單</h1> >
</div>
<header>
<h1 id="title" style="font-size: 80px">git-flow 備忘清單</h1>
<p id="author"> <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> 建立 由
<a href="http://twitter.com/0r1g4m14dd1c7" target="_blank"
>Daniel Kummer (<a href="https://twitter.com/share" data-size="large"
>Tweet</a
>)</a
>
建立
</p> </p>
<p id="desc">使用 git-flow 進行高效率的分支使用。 by <a href="http://nvie.com/" target="_blank">Vincent Driessen</a></p> <p id="desc">
<p id="translations">翻譯: 使用 git-flow 進行高效率的分支使用。 by
<a href="index.html" title="english">English</a> - <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.es_ES.html" title="spanish">Castellano</a> -
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> - <a href="index.pt_BR.html" title="Brazilian Portugues"
<a href="#" class="active" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - >Brazilian Portugues</a
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a><br /> >
-
<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.ja_JP.html" title="日本語">日本語</a> -
<a href="index.tr_TR.html" title="Turkce">Türkçe</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.ko_KR.html" title="한국어">한국어(Korean)</a> -
<a href="index.fr_FR.html" title="Français">Français</a> - <a href="index.fr_FR.html" title="Français">Français</a> -
<a href="index.hu_HU.html" title="hungarian">Magyar(Hungarian)</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</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.de_DE.html" title="German">Deutsch (German)</a> -
<a href="index.ca_CA.html" title="Català">Català (Catalan)</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.ro_RO.html" title="Romanian">Română (Romanian)</a> -
<a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a> - <a href="index.el_GR.html" title="Ελληνικά (Greek)">Ελληνικά (Greek)</a>
<a href="index.uk_UA.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.uk_UA.html" title="Ukrainian">Українська (Ukrainian)</a>
<a href="index.pl_PL.html" title="Polish">Polski</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.ar_MA.html" title="العربية">العربية</a> - <a href="index.ar_MA.html" title="العربية">العربية</a> -
<a href="index.fa_FA.html" title="فارسی">فارسی</a> - <a href="index.fa_FA.html" title="فارسی">فارسی</a> -
<a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a> <a href="index.az_AZ.html" title="Polish">Azərbaycanca (Azerbaijani)</a>
<a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a> <a href="index.id_ID.html" title="Bahasa Indonesia">Bahasa Indonesia</a>
</p> </p>
</header> </header>
<div id="main"> <div id="main">
<div class="scrollblock">
<div class="scrollblock">
<h2>什麼是 git-flow ?</h2> <h2>什麼是 git-flow ?</h2>
<p> <p>
git-flow 是一個 git 擴充功能，依照 Vincent Driessen 的分支模型提供高層次的倉庫控制方式。 git-flow 是一個 git 擴充功能，依照 Vincent Driessen
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">查看更多</a></small> 的分支模型提供高層次的倉庫控制方式。
<small
><a href="http://nvie.com/posts/a-successful-git-branching-model/"
>查看更多</a
></small
>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>這個備忘清單將會為您展示 git-flow 的基本操作方式與結果。</p> <p>這個備忘清單將會為您展示 git-flow 的基本操作方式與結果。</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>基礎提示</h2> <h2>基礎提示</h2>
<ul> <ul>
<li>git-flow 提供了極為出色的指令與輸出提示。請仔細閱讀並觀察發生了什麼事情...</li> <li>
<li><a href="http://www.sourcetreeapp.com/">SourceTree</a> 是一個極為出色的 git 圖形介面應用程式，以內建了 git-flow 的功能。(支援 Mac OS X 與 Windows)</li> git-flow
<li>git-flow 是一個以合並(Merge)概念為基底的解決方案，它並無提供重置(rebase)特性分支的功能。</li> 提供了極為出色的指令與輸出提示。請仔細閱讀並觀察發生了什麼事情...
</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> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="setup" href="#setup">安裝</a></h2> <h2><a name="setup" href="#setup">安裝</a></h2>
<ul> <ul>
<li>你需要有一個已經初始化的 git 倉庫。</li> <li>你需要有一個已經初始化的 git 倉庫。</li>
@ -100,47 +158,49 @@
<div class="col-1"> <div class="col-1">
<h3>Mac OS X</h3> <h3>Mac OS X</h3>
<span>透過 Homebrew 安裝</span> <span>透過 Homebrew 安裝</span>
<blockquote> <blockquote>$ brew install git-flow-avh</blockquote>
$ brew install git-flow-avh
</blockquote>
<span>透過 Macports 安裝</span> <span>透過 Macports 安裝</span>
<blockquote> <blockquote>$ port install git-flow-avh</blockquote>
$ port install git-flow-avh
</blockquote>
<h3>Linux</h3> <h3>Linux</h3>
<blockquote> <blockquote>$ apt-get install git-flow</blockquote>
$ apt-get install git-flow
</blockquote>
<h3>Windows (Cygwin)</h3> <h3>Windows (Cygwin)</h3>
<blockquote> <blockquote>
$ wget -q -O - --no-check-certificate $ wget -q -O - --no-check-certificate
https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh install stable | bash https://raw.github.com/petervanderdoes/gitflow-avh/develop/contrib/gitflow-installer.sh
install stable | bash
</blockquote> </blockquote>
<p>在 Windows 下安装 git-flow, 你會需要 wget 和 util-linux。</p> <p>在 Windows 下安装 git-flow, 你會需要 wget 和 util-linux。</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <p>
更詳細的 git-flow 安裝指南，請參閱 <a href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation" target="_blank">git flow wiki</a>. 更詳細的 git-flow 安裝指南，請參閱
<a
href="https://github.com/petervanderdoes/gitflow-avh/wiki/Installation"
target="_blank"
>git flow wiki</a
>.
</p> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow" />
</div>
</div> </div>
</div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">開始 git-flow</a></h2> <h2>
<a name="getting_started" href="#getting_started">開始 git-flow</a>
</h2>
<p>在開始使用 git-flow 之前，你必須完成一些簡單的設定。</p> <p>在開始使用 git-flow 之前，你必須完成一些簡單的設定。</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>初始化</h3> <h3>初始化</h3>
<p>開始使用 git-flow 前，你必須切換目錄至你的 git 專案中，並且以下列指令進行初始化:</p>
<blockquote>
git flow init
</blockquote>
<p> <p>
接著您必須回答幾個問題，是關於分支名稱的定義。<br/>這裡建議使用預設值。 開始使用 git-flow 前，你必須切換目錄至你的 git
專案中，並且以下列指令進行初始化:
</p>
<blockquote>git flow init</blockquote>
<p>
接著您必須回答幾個問題，是關於分支名稱的定義。<br />這裡建議使用預設值。
</p> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="initialize"></div> <div class="initialize"></div>
@ -148,10 +208,9 @@
<div class="lines-open"></div> <div class="lines-open"></div>
<div class="lines-big"></div> <div class="lines-big"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="features" href="#features">新功能分支(Feature)</a></h2> <h2><a name="features" href="#features">新功能分支(Feature)</a></h2>
<ul class="narrow"> <ul class="narrow">
@ -164,26 +223,25 @@
<h3>開始新功能設計</h3> <h3>開始新功能設計</h3>
<p>新功能的開發是由 'develop' 分支的最後一個版本發展出來的。</p> <p>新功能的開發是由 'develop' 分支的最後一個版本發展出來的。</p>
<p>使用下列的命令可以開始一個新功能的分支：</p> <p>使用下列的命令可以開始一個新功能的分支：</p>
<blockquote> <blockquote>git flow feature start MYFEATURE</blockquote>
git flow feature start MYFEATURE <p>
</blockquote> 這個命令將會於 'develop' 的最後一個版本建立出另一個
<p>這個命令將會於 'develop' 的最後一個版本建立出另一個 'feature/MYFEATURE' 分支，並自動切換至這個分支底下。現在你可以開始製作新功能。</p> 'feature/MYFEATURE'
分支，並自動切換至這個分支底下。現在你可以開始製作新功能。
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-start"></div> <div class="feature-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>完成新功能</h3> <h3>完成新功能</h3>
<p>當你在新功能分支完成新功能後，使用下列指令來結束新功能開發: <p>當你在新功能分支完成新功能後，使用下列指令來結束新功能開發:</p>
</p> <blockquote>git flow feature finish MYFEATURE</blockquote>
<blockquote> <p>這個指令會替你完成下列動作:</p>
git flow feature finish MYFEATURE
</blockquote>
<p>這個指令會替你完成下列動作:
<ul> <ul>
<li>合並(Merge) MYFEATURE 分支回到 'develop'</li> <li>合並(Merge) MYFEATURE 分支回到 'develop'</li>
<li>刪除這個新功能分支</li> <li>刪除這個新功能分支</li>
@ -193,27 +251,26 @@
<div class="col-2"> <div class="col-2">
<div class="feature-end"></div> <div class="feature-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>發佈新功能分支</h3> <h3>發佈新功能分支</h3>
<p> <p>
你是否需多人合作開發新功能？<br/> 你是否需多人合作開發新功能？<br />
透過下列命令來發佈新功能分支到遠端 git 伺服器，讓其他使用者也能共用這個新功能分支。 透過下列命令來發佈新功能分支到遠端 git
伺服器，讓其他使用者也能共用這個新功能分支。
</p> </p>
<blockquote> <blockquote>git flow feature publish MYFEATURE</blockquote>
git flow feature publish MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-publish"></div> <div class="feature-publish"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>取得新功能分支</h3> <h3>取得新功能分支</h3>
@ -221,25 +278,18 @@
當你需接手完成新功能時，透過下列命令取得遠端伺服器上的新功能分支，並得到所有保存在遠端伺服器上的變更紀錄： 當你需接手完成新功能時，透過下列命令取得遠端伺服器上的新功能分支，並得到所有保存在遠端伺服器上的變更紀錄：
</p> </p>
<blockquote> <blockquote>git flow feature pull MYFEATURE</blockquote>
git flow feature pull MYFEATURE
</blockquote>
<p> <p>你也可以透過下列指令進而追蹤一個功能:</p>
你也可以透過下列指令進而追蹤一個功能:
</p>
<blockquote> <blockquote>git flow feature track MYFEATURE</blockquote>
git flow feature track MYFEATURE
</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="release" href="#release">製作發佈版本(release)</a></h2> <h2><a name="release" href="#release">製作發佈版本(release)</a></h2>
<ul> <ul>
@ -251,33 +301,39 @@
<h3>開始推出新版本</h3> <h3>開始推出新版本</h3>
<p>使用下列指令準備推出(release)新版本分支:</p> <p>使用下列指令準備推出(release)新版本分支:</p>
<blockquote> <blockquote>git flow release start RELEASE [BASE]</blockquote>
git flow release start RELEASE [BASE] <p>它會從 'develop' 分支的最後一個版本創建出 release 分支。</p>
</blockquote>
<p> <p>
它會從 'develop' 分支的最後一個版本創建出 release 分支。 你也可以選擇性的加入一個 sha-1 hash
於<code>[BASE]</code>參數，這會讓 release 分支於您指定的 develop
提交紀錄點產生分支。有一點需要注意的是，sha-1 hash 只能是於'develop'
分支下。
</p> </p>
<p>你也可以選擇性的加入一個 sha-1 hash 於<code>[BASE]</code>參數，這會讓 release 分支於您指定的 develop 提交紀錄點產生分支。有一點需要注意的是，sha-1 hash 只能是於'develop' 分支下。</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>最佳的狀況下，在創建出新的 release 分支後，應要立即的發布至遠端伺服器上，讓其他團隊中的開發者也能存取這個 release 分支。而這個發布指令很類似於發布新功能:</p> <p>
<blockquote> 最佳的狀況下，在創建出新的 release
git flow release publish RELEASE 分支後，應要立即的發布至遠端伺服器上，讓其他團隊中的開發者也能存取這個
</blockquote> release 分支。而這個發布指令很類似於發布新功能:
<p>(您也可以透過 <br/><code>git flow release track RELEASE</code> 指令來取得 release 版本的遠端更改)</p> </p>
<blockquote>git flow release publish RELEASE</blockquote>
<p>
(您也可以透過 <br /><code>git flow release track RELEASE</code>
指令來取得 release 版本的遠端更改)
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>完成推出新版本</h3> <h3>完成推出新版本</h3>
<p>完成 release 版本是一個很大的 git 分支操作。但你只許要執行下列指令:</p> <p>
<blockquote> 完成 release 版本是一個很大的 git 分支操作。但你只許要執行下列指令:
git flow release finish RELEASE </p>
</blockquote> <blockquote>git flow release finish RELEASE</blockquote>
<p>git flow 會幫你執行下面幾個步驟:</p> <p>git flow 會幫你執行下面幾個步驟:</p>
<ul> <ul>
<li>合並 release 分支到 'master'</li> <li>合並 release 分支到 'master'</li>
@ -288,99 +344,117 @@
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-end"></div> <div class="release-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">快速修復(hotfix)</a></h2> <h2><a name="hotfixes" href="#hotfixes">快速修復(hotfix)</a></h2>
<ul> <ul>
<li>當你的產品發佈環境處於不可預期的狀況，且發生了一些需要立即修正的問題，您可以使用 hotfix 來幫助您。</li> <li>
當你的產品發佈環境處於不可預期的狀況，且發生了一些需要立即修正的問題，您可以使用
hotfix 來幫助您。
</li>
<li>hotfix 是從 master 中加入的版本標籤開始。</li> <li>hotfix 是從 master 中加入的版本標籤開始。</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>開始快速修復</h3> <h3>開始快速修復</h3>
<p>快速修復(hotfix)就像其他的 git flow 指令一樣，您可以透過下列指令開始：</p> <p>
<blockquote> 快速修復(hotfix)就像其他的 git flow
git flow hotfix start VERSION [BASENAME] 指令一樣，您可以透過下列指令開始：
</blockquote> </p>
<p>你必須填寫一個 VERSION 參數，這代表當你完成 hotfix 時發佈的版本號碼。</p> <blockquote>git flow hotfix start VERSION [BASENAME]</blockquote>
<p>此外你可以自由挑選修復開始的分支名稱<code>[BASENAME]</code>，分支名稱如果不填寫的狀況下，預設是 'master'。</p> <p>
你必須填寫一個 VERSION 參數，這代表當你完成 hotfix
時發佈的版本號碼。
</p>
<p>
此外你可以自由挑選修復開始的分支名稱<code>[BASENAME]</code>，分支名稱如果不填寫的狀況下，預設是
'master'。
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>完成快速修復</h3> <h3>完成快速修復</h3>
<p>當你在快速修復分支完成修復後，透過下列的指令讓修復分支合並回 develop 和 master 分支。並且在 master 分支加上修訂版本號的標籤(tag):</p> <p>
<blockquote> 當你在快速修復分支完成修復後，透過下列的指令讓修復分支合並回 develop
git flow hotfix finish VERSION 和 master 分支。並且在 master 分支加上修訂版本號的標籤(tag):
</blockquote> </p>
<blockquote>git flow hotfix finish VERSION</blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-end"></div> <div class="hotfix-end"></div>
</div> </div>
</div> </div>
<div> <div>
<div class="col-1"></div> <div class="col-1"></div>
<div class="col-2"> <div class="col-2">
<div class="lines-close"></div> <div class="lines-close"></div>
<div class="lines-small-end"></div> <div class="lines-small-end"></div>
</div> </div>
</div> </div>
<div class="scrollblock">
<div class="scrollblock">
<h2><a name="commands" href="#commands">指令一覽圖</a></h2> <h2><a name="commands" href="#commands">指令一覽圖</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands" />
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>備註</h2> <h2>備註</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>這裡我們只介紹了重要且常用的功能，並非包含所有的指令。</li> <li>這裡我們只介紹了重要且常用的功能，並非包含所有的指令。</li>
<li>git-flow 只是一個額外的擴充功能，即使安裝了 git-flow 後你依然可以使用你所知道的原生 git 指令。</li> <li>
git-flow 只是一個額外的擴充功能，即使安裝了 git-flow
後你依然可以使用你所知道的原生 git 指令。
</li>
<li>'support' 分支目前為測試版本不建議使用。</li> <li>'support' 分支目前為測試版本不建議使用。</li>
<li>如果你很樂意提供翻譯，我很樂意整合。</li> <li>如果你很樂意提供翻譯，我很樂意整合。</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
</div> </div>
<footer>
<footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">建議與回應</a></h2> <h2><a name="comments" href="#comments">建議與回應</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>
</footer> </footer>
<script type="text/javascript"> <script type="text/javascript">
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */ /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
var disqus_shortname = 'gitflowcheatsheet'; // required: replace example with your forum shortname var disqus_shortname = "gitflowcheatsheet"; // required: replace example with your forum shortname
/* * * DON'T EDIT BELOW THIS LINE * * */ /* * * DON'T EDIT BELOW THIS LINE * * */
(function () { (function () {
var dsq = document.createElement('script'); var dsq = document.createElement("script");
dsq.type = 'text/javascript'; dsq.type = "text/javascript";
dsq.async = true; dsq.async = true;
dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js'; dsq.src = "https://" + disqus_shortname + ".disqus.com/embed.js";
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); (
document.getElementsByTagName("head")[0] ||
document.getElementsByTagName("body")[0]
).appendChild(dsq);
})(); })();
</script> </script>
<noscript>請允許你的瀏覽器使用 JavaScript 才能看得到<a href="http://disqus.com/?ref_noscript">建議與回應 powered by Disqus.</a> <noscript
</noscript> >請允許你的瀏覽器使用 JavaScript 才能看得到<a
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a> href="http://disqus.com/?ref_noscript"
>建議與回應 powered by Disqus.</a
</body> >
</noscript>
<a href="http://disqus.com" class="dsq-brlink"
>comments powered by <span class="logo-disqus">Disqus</span></a
>
</body>
</html> </html>