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

Merge pull request #33 from tpai/patch-1

Browse Source 
add zh_TW translation link into index.html
This commit is contained in:
Daniel Kummer 2015-01-20 16:16:24 +01:00
commit 7f90472a6d
14 changed files with 1014 additions and 991 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
index.ca_CA.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="ca" 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">
@ -7,7 +7,6 @@
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'> <link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print"> <link rel="stylesheet" href="css/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.css" type="text/css" media="screen,print">
<link rel="stylesheet" href="css/style.ca_CA.css" type="text/css" media="screen,print">
<script src="js/jquery-1.7.2.min.js"></script> <script src="js/jquery-1.7.2.min.js"></script>
@ -34,7 +33,7 @@
<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> 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 href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a>
<script>!function (d, s, id) { <script>!function (d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0]; var js, fjs = d.getElementsByTagName(s)[0];
@ -46,11 +45,12 @@
} }
}(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">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p>
<p id="translations">traduccions: <p id="translations">translations:
<a href="index.html" class="active" title="english">English</a> - <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">Brazilian Portugues</a> -
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - <a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
<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> -
@ -60,7 +60,7 @@
<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="index.ca_CA.html" title="Català">Català (Catalan)</a>
</p> </p>
</header> </header>
@ -68,36 +68,38 @@
<div class="scrollblock"> <div class="scrollblock">
<h2>Sobre git-flow</h2> <h2>About</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 are a set of git extensions to provide high-level repository operations for Vincent
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">més</a></small> Driessen's branching model.
<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>Aquest full de referència ràpida mostra l'ús bàsic i l'efecte de les operacions de git-flow</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>Consells bàsics</h2> <h2>Basic tips</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>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li>
<li>El client per OSX/Windows <a href="http://www.sourcetreeapp.com/">Sourcetree</a> és una excel·lent interfície gràfica per git i té suport per git-flow <li>The OSX/Windows Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides
git-flow support
</li> </li>
<li>Git-flow és una solució basada en merge. No fa rebase de branques de funcionalitat (feature branches).</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">Instal·lació</a></h2> <h2><a name="setup" href="#setup">Setup</a></h2>
<ul> <ul>
<li>Necessites una instal·lació de git funcionant com a prerrequisit.</li> <li>You need a working git installation as prerequisite.</li>
<li>Git flow funciona a OSX, Linux i Windows</li> <li>Git flow works on OSX, Linux and 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">
@ -119,30 +121,31 @@
$ 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>Necessites wget i util-linux per instal·lar 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>
Per instruccions detallades per instal·lar git flow, visita la <a href="https://github.com/nvie/gitflow/wiki/Windows">wiki de git flow</a>. For detailed git flow intallation instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">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">Començant</a></h2> <h2><a name="getting_started" href="#getting_started">Getting started</a></h2>
<p>Git flow necessita inicialitzar-se per personalitzar la configuració del teu projecte.</p> <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>Inicialitzar</h3> <h3>Initialize</h3>
<p>Comença a usar git-flow inicialitzant-lo en un repositori git existent:</p> <p>Start using git-flow by initializing it inside an existing git repository:</p>
<blockquote> <blockquote>
git flow init git flow init
</blockquote> </blockquote>
<p> <p>
Hauràs de contestar unes preguntes respecte les convencions per anomenar les branques.<br/> You'll have to answer a few questions regarding the naming conventions for your branches.<br/>
Es recomana usar els valors per defecte. It's recommended to use the default values.
</p> </p>
</div> </div>
@ -156,22 +159,22 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="features" href="#features">Funcionalitats (features)</a></h2> <h2><a name="features" href="#features">Features</a></h2>
<ul class="narrow"> <ul class="narrow">
<li>Desenvolupa noves funcionalitats per les properes entregues (releases)</li> <li>Develop new features for upcoming releases</li>
<li>Normalment només existeixen en els repositoris dels desenvolupadors</li> <li>Typically exist in developers repos only</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>Start a new feature</h3>
<p>El desenvolupament de noves funcionalitats comença des de la branca 'develop'.</p> <p>Development of new features starting from the 'develop' branch.</p>
<p>Comença a desenvolupar una nova funcionalitat amb</p> <p>Start developing a new feature with</p>
<blockquote> <blockquote>
git flow feature start LAMEVAFUNCIONALITAT git flow feature start MYFEATURE
</blockquote> </blockquote>
<p>Aquesta acció crea una nova branca de funcionalitat basada en 'develop' i la fa activa</p> <p>This action creates a new feature branch based on 'develop' and switches to it</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -191,20 +194,20 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Acaba una funcionalitat</h3> <h3>Finish up a feature</h3>
<p> <p>
Acaba el desenvolupament d'una funcionalitat. Finish the development of a feature.
Aquesta acció realitza el següent: This action performs the following
</p> </p>
<ul> <ul>
<li>Integra LAMEVAFUNCIONALITAT a 'develop'</li> <li>Merged MYFEATURE into 'develop'</li>
<li>Esborra la branca de funcionalitat</li> <li>Removes the feature branch</li>
<li>Torna a fer activa la branca 'develop'</li> <li>Switches back to 'develop' branch</li>
</ul> </ul>
<blockquote> <blockquote>
git flow feature finish LAMEVAFUNCIONALITAT git flow feature finish MYFEATURE
</blockquote> </blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
@ -214,15 +217,15 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Publica una funcionalitat</h3> <h3>Publish a feature</h3>
<p> <p>
Estàs desenvolupant una funcionalitat en col·laboració amb altres desenvolupadors? <br/> Are you developing a feature in collaboration? <br/>
Publica una funcionalitat al servidor remot de manera que hi puguin accedir altres usuaris. Publish a feature to the remote server so it can be used by other users.
</p> </p>
<blockquote> <blockquote>
git flow feature publish LAMEVAFUNCIONALITAT git flow feature publish MYFEATURE
</blockquote> </blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
@ -232,17 +235,17 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Obtenint una funcionlitat publicada</h3> <h3>Getting a published feature</h3>
<p> <p>
Obté una funcionalitat publicada per un altre usuari. Get a feature published by another user.
</p> </p>
<blockquote> <blockquote>
git flow feature pull origin LAMEVAFUNCIONALITAT git flow feature pull origin MYFEATURE
</blockquote> </blockquote>
<p>Pots seguir una funcionalitat a l'origen usant <code> git flow feature track LAMEVAFUNCIONALITAT</code> </p> <p>You can track a feature on origin by using <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>
@ -251,27 +254,29 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="release" href="#release">Fes una entrega (release)</a></h2> <h2><a name="release" href="#release">Make a release</a></h2>
<ul> <ul>
<li>Prepara una nova entrega a producció</li> <li>Support preparation of a new production release</li>
<li>Permet arreglar petits errors i preparar les meta-dades per l'entrega</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>Comença una entrega</h3> <h3>Start a release</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>To start a release, use the git flow release command. It creates a release branch created from the 'develop' branch.</p>
<blockquote> <blockquote>
git flow release start ENTREGA [BASE] git flow release start RELEASE [BASE]
</blockquote> </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>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>É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>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>
<blockquote> <blockquote>
git flow release publish ENTREGA git flow release publish RELEASE
</blockquote> </blockquote>
<p>Pots seguir una entrega en remot amb la comanda <br/><code>git flow release track ENTREGA</code></p> <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>
@ -280,19 +285,19 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Acaba una entrega</h3> <h3>Finish up a release</h3>
<p>Acabar una entrega és un dels grans passos en la gestió de branques amb git. Realitza les següents accions:</p> <p>Finishing a release is one of the big steps in git branching. It performs several actions:</p>
<ul> <ul>
<li>Integra la branca d'entrega a 'master'</li> <li>Merges the release branch back into 'master'</li>
<li>Etiqueta l'entrega amb el seu nom</li> <li>Tags the release with its name</li>
<li>Reintegra l'entrega a 'develop'</li> <li>Back-merges the release into 'develop'</li>
<li>Esborra la branca d'entrega</li> <li>Removes the release branch</li>
</ul> </ul>
<blockquote> <blockquote>
git flow release finish ENTREGA git flow release finish RELEASE
</blockquote> </blockquote>
<p>No oblidis pujar les etiquetes amb <code>git push --tags</code></p> <p>Don't forget to push your tags with<code>git push --tags</code></p>
</div> </div>
<div class="col-2"> <div class="col-2">
@ -302,22 +307,22 @@
</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">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>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version
</li> </li>
<li>Es pot crear una branca des de l'etiqueta corresponent a la branca 'master' que marqui la versió a producció.</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>Com les altres comandes de git flow, un hotfix s'inicia amb</p> <p>Like the other git flow commands, a hotfix is started with</p>
<blockquote> <blockquote>
git flow hotfix start VERSIÓ [NOMBASE] git flow hotfix start VERSION [BASENAME]
</blockquote> </blockquote>
<p>El paràmetre de la versió marca el nom de la nova entrega. Opcionalment pots especificar un nom base a partir del qual començar.</p> <p>The version argument hereby marks the new hotfix release name. 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>
@ -326,11 +331,11 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Acaba un hotfix</h3> <h3>Finish a 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>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version.</p>
<blockquote> <blockquote>
git flow hotfix finish VERSIÓ git flow hotfix finish VERSION
</blockquote> </blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
@ -348,19 +353,20 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="commands" href="#commands">Comandes</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>Tasques pendents</h2> <h2>Backlog</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>Not all available commands are covered here, only the most important ones</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>You can still use git and all its commands normally as you know them, git flow is only a tooling
collection
</li> </li>
<li>La funcionalitat 'support' encara està en fase beta, no s'aconsella usar-la</li> <li>The 'support' feature is still beta, using it is not advised</li>
<li>Si vols ajudar en la traducció, <a href="https://github.com/danielkummer/git-flow-cheatsheet">endavant!</a></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>
@ -370,7 +376,7 @@
<footer> <footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Comentaris</a></h2> <h2><a name="comments" href="#comments">Comments</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>

192
index.de_DE.html
View File

@ -30,10 +30,10 @@
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div> <div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
<header> <header>
<h1 id="title">git-flow Spickzettel</h1> <h1 id="title">git-flow cheatsheet</h1>
<p id="author"> <p id="author">
erstellt von <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 href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a>
<script>!function (d, s, id) { <script>!function (d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0]; var js, fjs = d.getElementsByTagName(s)[0];
@ -45,11 +45,12 @@
} }
}(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">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p>
<p id="translations">Übersetzungen: <p id="translations">translations:
<a href="index.html" title="English">English</a> - <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">Brazilian Portugues</a> -
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - <a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
<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> -
@ -58,7 +59,7 @@
<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="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>
</p> </p>
</header> </header>
@ -67,36 +68,38 @@
<div class="scrollblock"> <div class="scrollblock">
<h2>Über</h2> <h2>About</h2>
<p> <p>
git-flow ist ein Set aus Git-Erweiterungen, welches komplexe Repository-Arbeiten git-flow are a set of git extensions to provide high-level repository operations for Vincent
nach Vincent Driessen's Branching-Modell ermöglicht. Driessen's branching model.
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">mehr</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>Dieser Spickzettel veranschaulicht die grundlegende Nutzung und den Ablauf von git-flow Operationen.</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>Grundlegende Tipps</h2> <h2>Basic tips</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>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li>
<li>Der OSX/Windows Client <a href="http://www.sourcetreeapp.com/">SourceTree</a> bietet ein exzellentes grafisches Interface und einfache Git-Flow Unterstützung.</li> <li>The OSX/Windows Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides
<li>git-flow ist eine rein Merge-basierte Lösung (Zusammenführung). Es findet kein Rebasing der Feature-Branches (Entwicklungszweige) statt.</li> git-flow support
</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">Einrichtung</a></h2> <h2><a name="setup" href="#setup">Setup</a></h2>
<ul> <ul>
<li>Du benötigst eine funktionierende Git Installation als Voraussetzung.</li> <li>You need a working git installation as prerequisite.</li>
<li>git-flow läuft unter OSX, Linux und Windows.</li> <li>Git flow works on OSX, Linux and 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">
@ -118,11 +121,11 @@
$ 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>Du benötigst wget und util-linux um git-flow zu installieren.</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>
Für eine detaillierte git-flow Installationsanleitung, besuche bitte das <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow For detailed git flow intallation instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow
wiki</a>. wiki</a>.
</p> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow"/>
@ -130,19 +133,19 @@
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">Erste Schritte</a></h2> <h2><a name="getting_started" href="#getting_started">Getting started</a></h2>
<p>git-flow muss initalisiert werden, um das Projektsetup anzupassen.</p> <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>Initialisierung</h3> <h3>Initialize</h3>
<p>Fange an mit git-flow zu arbeiten, indem Du es innerhalb eines bestehenden Git-Repository initialisierst:</p> <p>Start using git-flow by initializing it inside an existing git repository:</p>
<blockquote> <blockquote>
git flow init git flow init
</blockquote> </blockquote>
<p> <p>
Dabei musst Du einige Fragen bezueglich der Namenskoventionen Deiner Branches (Entwicklungszweige) beantworten.<br/> You'll have to answer a few questions regarding the naming conventions for your branches.<br/>
Es wird empfohlen, die Standardwerte zu verwenden. It's recommended to use the default values.
</p> </p>
</div> </div>
@ -159,19 +162,19 @@
<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>Entwicklung neuer Features für bevorstehende Releases.</li> <li>Develop new features for upcoming releases</li>
<li>In der Regel nur in Entwickler-Repositories zu finden.</li> <li>Typically exist in developers repos only</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>Entwicklung neuer Features</h3> <h3>Start a new feature</h3>
<p>Neue Features werden vom 'develop'-Branch abgeleitet.</p> <p>Development of new features starting from the 'develop' branch.</p>
<p>Starte die Entwicklung eines neuen Features mittels</p> <p>Start developing a new feature with</p>
<blockquote> <blockquote>
git flow feature start MYFEATURE git flow feature start MYFEATURE
</blockquote> </blockquote>
<p>Dieser Befehl erstellt einen neuen Feature-Branch basierend auf 'develop' und wechselt in diesen.</p> <p>This action creates a new feature branch based on 'develop' and switches to it</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -191,16 +194,16 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Fertigstellung eines Features</h3> <h3>Finish up a feature</h3>
<p> <p>
Beende die Entwicklung eines Features. Finish the development of a feature.
Dies führt zu folgenden Aktionen: This action performs the following
</p> </p>
<ul> <ul>
<li>Zusammenführen von MYFEATURE in den 'develop'-Branch (Merge-Prozess)</li> <li>Merged MYFEATURE into 'develop'</li>
<li>Entfernt den Feature-Branch</li> <li>Removes the feature branch</li>
<li>Wechselt zurück in den 'develop'-Branch</li> <li>Switches back to 'develop' branch</li>
</ul> </ul>
<blockquote> <blockquote>
@ -214,12 +217,11 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Veröffentlichen eines Features</h3> <h3>Publish a feature</h3>
<p> <p>
Entwickelst Du ein Feature in Zusammenarbeit? <br/> Are you developing a feature in collaboration? <br/>
Veröffentliche Dein Feature auf einem entfernten Server, Publish a feature to the remote server so it can be used by other users.
so dass es auch von anderen verfolgt werden kann.
</p> </p>
<blockquote> <blockquote>
@ -233,23 +235,17 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Holen eines veröffentlichten Features</h3> <h3>Getting a published feature</h3>
<p> <p>
Hole ein Feature, welches von einem anderen Nutzer veröffentlicht wurde. Get a feature published by another user.
</p> </p>
<blockquote> <blockquote>
git flow feature pull origin MYFEATURE git flow feature pull origin MYFEATURE
</blockquote> </blockquote>
<p> <p>You can track a feature on origin by using <code> git flow feature track MYFEATURE</code> </p>
Du kannst ein Feature unter Verwendung von
</p>
<blockquote>git flow feature track MYFEATURE</blockquote>
<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>
@ -258,41 +254,29 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="release" href="#release">Erstelle ein Release</a></h2> <h2><a name="release" href="#release">Make a release</a></h2>
<ul> <ul>
<li>Unterstützt die Fertigstellung einer Produktionsversion.</li> <li>Support preparation of a new production release</li>
<li>Erlaubt geringfügige Bugfixes und die Erstellung der Metadaten für ein 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>Beginne ein Release</h3> <h3>Start a release</h3>
<p> <p>To start a release, use the git flow release command. It creates a release branch created from the 'develop' branch.</p>
Um ein neues Releases zu beginnen, benutze den git flow release Befehl.
Mit diesem wird ein Release-Branch vom aktuellen 'develop'-Branch erstellt.
</p>
<blockquote> <blockquote>
git flow release start RELEASE [BASE] git flow release start RELEASE [BASE]
</blockquote> </blockquote>
<p> <p>You can optionally supply a <code>[BASE]</code> commit sha-1 hash to start the release from. The commit must
Du kannst optional einen <code>[BASE]</code> Commit sha-1 Hash bereitstellen, be on the
um ein Release von diesem Commit zu starten. Der Commit muss sich im 'develop'-Branch befinden. 'develop' branch.</p>
</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>
Es ist ratsam, den Release-Branch nach der Erstellung zu veröffentlichen und damit anderen Entwicklern
die Möglichkeit für Comitts zu geben. Mache es ähnlich wie bei einem Feature-Branch mit dem Befehl:
</p>
<blockquote> <blockquote>
git flow release publish RELEASE git flow release publish RELEASE
</blockquote> </blockquote>
<p> <p>(You can track a remote release with the <br/><code>git flow release track RELEASE</code> command)</p>
(Du kannst ein entferntes Remote-Release mittels <br/>
<code>git flow release track RELEASE</code> verfolgen.)
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
@ -301,22 +285,19 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Fertigstellung eines Releases</h3> <h3>Finish up a release</h3>
<p> <p>Finishing a release is one of the big steps in git branching. It performs several actions:</p>
Das Beenden eines Releases ist einer der größten Schritte im Git-Branching-Prozess.
Es bewirkt folgende Aktionen:
</p>
<ul> <ul>
<li>Zusammenführen des Release-Branches zurück in den 'master'-Branch. (Merge-Prozess)</li> <li>Merges the release branch back into 'master'</li>
<li>Markiert (Tagged) das Release mit seinem Namen</li> <li>Tags the release with its name</li>
<li>Zurückführen des Releases in den 'develop'-Branch (Merge-Prozess)</li> <li>Back-merges the release into 'develop'</li>
<li>Entfernt den Release-Branch</li> <li>Removes the release branch</li>
</ul> </ul>
<blockquote> <blockquote>
git flow release finish RELEASE git flow release finish RELEASE
</blockquote> </blockquote>
<p>Vergesse nicht Deine Tags mittels <code>git push --tags</code> zu pushen.</p> <p>Don't forget to push your tags with<code>git push --tags</code></p>
</div> </div>
<div class="col-2"> <div class="col-2">
@ -329,28 +310,19 @@
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2> <h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
<ul> <ul>
<li> <li>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version
Hotfixes werden notwendig, sobald ein unerwünschter Zustand innerhalb einer Live-Produktionsversion
eintritt und resultierend daraus, sofort gehandelt werden muss.
</li>
<li>
Ein Hotfix kann aus dem entsprechenden Tag des 'master'-Branches, welcher die Produktionsversion markiert,
direkt abgezweigt werden.
</li> </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>Ähnlich wie auch die anderen git-flow Befehle, wird ein Hotfix mittels</p> <p>Like the other git flow commands, a hotfix is started with</p>
<blockquote> <blockquote>
git flow hotfix start VERSION [BASENAME] git flow hotfix start VERSION [BASENAME]
</blockquote> </blockquote>
<p> <p>The version argument hereby marks the new hotfix release name. Optionally you can specify a basename to start from.</p>
begonnen. Das VERSION-Argument markiert hierbei den neuen Hotfix-Release-Namen.
Optional kannst Du auch einen BASENAME spezifizieren.
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
@ -359,13 +331,9 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Fertigstellung eines Hotfixes</h3> <h3>Finish a hotfix</h3>
<p> <p>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version.</p>
Mit dem Beenden eines Hotfixes, wird dieser in den 'develop'- und 'master'-Branch
zusammengeführt (Merge). Nebenbei wird der 'master'-Branch mit einem Tag
welcher die Hotfix-Version beinhaltet markiert.
</p>
<blockquote> <blockquote>
git flow hotfix finish VERSION git flow hotfix finish VERSION
</blockquote> </blockquote>
@ -385,7 +353,7 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="commands" href="#commands">Befehle</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>
@ -393,10 +361,12 @@
<h2>Backlog</h2> <h2>Backlog</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Nicht alle verfügbaren Befehle sind hier abgedeckt, nur die wichtigsten.</li> <li>Not all available commands are covered here, only the most important ones</li>
<li>Du kannst weiterhin alle Git-Befehle normal nutzen, wie Du es gewohnt bist. Git-flow ist nur eine Werkzeugsammlung.</li> <li>You can still use git and all its commands normally as you know them, git flow is only a tooling
<li>Das 'support' Feature ist noch Beta und die Nutzung nicht empfohlen.</li> collection
<li>Wenn Du Übersetzungen beisteuern möchtest, würde ich mich freuen diese zu integrieren.</li> </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>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
@ -406,7 +376,7 @@
<footer> <footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Kommentare</a></h2> <h2><a name="comments" href="#comments">Comments</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>
@ -425,9 +395,9 @@
(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>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
</noscript> </noscript>
<a href="http://disqus.com" class="dsq-brlink">Kommentare powered by <span class="logo-disqus">Disqus</span></a> <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
</body> </body>

159
index.es_ES.html
View File

@ -33,7 +33,7 @@
<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> 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 href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a>
<script>!function (d, s, id) { <script>!function (d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0]; var js, fjs = d.getElementsByTagName(s)[0];
@ -45,13 +45,15 @@
} }
}(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">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p>
<p id="translations">traducciones: <p id="translations">translations:
<a href="index.html" title="english">English</a> - <a href="#" class="active" title="english">English</a> -
<a href="#" class="active" 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">Brazilian Portugues</a> -
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - <a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
<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.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.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
@ -66,38 +68,38 @@
<div class="scrollblock"> <div class="scrollblock">
<h2>Acerca de git-flow</h2> <h2>About</h2>
<p> <p>
git-flow es un conjunto de extensiones para git que proveen comandos de alto nivel para operar repositorios git-flow are a set of git extensions to provide high-level repository operations for Vincent
basados en el modelo de ramificaciones de Vincent Driessen's branching model.
Driessen. <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/">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>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>Consejos básicos</h2> <h2>Basic tips</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>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li>
<li>El cliente para OSX <a href="http://www.sourcetreeapp.com/">Sourcetree</a> es una excelente GUI para git y tiene soporte para git-flow <li>The OSX/Windows Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides
git-flow support
</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> <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">Configuración</a></h2> <h2><a name="setup" href="#setup">Setup</a></h2>
<ul> <ul>
<li>Un prerequisito es una instalación de git en funcionamiento.</li> <li>You need a working git installation as prerequisite.</li>
<li>Git flow funciona en OSX, Linux y Windows</li> <li>Git flow works on OSX, Linux and 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">
@ -119,30 +121,31 @@
$ 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>Necesitarás wget y util-linux para instalar 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>
Para instrucciones de instalación detalladas, por favor, visite la <a href="https://github.com/nvie/gitflow/wiki/Windows">wiki de git flow</a> For detailed git flow intallation instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">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">Introducción</a></h2> <h2><a name="getting_started" href="#getting_started">Getting started</a></h2>
<p>Git flow necesita ser inicializado para poder alterar la configuración del proyecto.</p> <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>Inicialización</h3> <h3>Initialize</h3>
<p>Comience a usar git-flow inicializándolo desde dentro de un repositorio git existente:</p> <p>Start using git-flow by initializing it inside an existing git repository:</p>
<blockquote> <blockquote>
git flow init git flow init
</blockquote> </blockquote>
<p> <p>
Deberá contestar algunas preguntas relacionadas con las convenciones de nombres para las ramas.<br/> You'll have to answer a few questions regarding the naming conventions for your branches.<br/>
Se recomienda utilizar los valores predeterminados. It's recommended to use the default values.
</p> </p>
</div> </div>
@ -156,22 +159,22 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="features" href="#features">Características</a></h2> <h2><a name="features" href="#features">Features</a></h2>
<ul class="narrow"> <ul class="narrow">
<li>Desarrollar características para futuras versiones</li> <li>Develop new features for upcoming releases</li>
<li>Es típico que sólo se use en los repositorios para desarrollo</li> <li>Typically exist in developers repos only</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 nueva característica</h3> <h3>Start a new feature</h3>
<p>El desarrollo de nuevas características parte de la rama 'develop'.</p> <p>Development of new features starting from the 'develop' branch.</p>
<p>Comienze una nueva característica usando</p> <p>Start developing a new feature with</p>
<blockquote> <blockquote>
git flow feature start MYFEATURE git flow feature start MYFEATURE
</blockquote> </blockquote>
<p>Esta acción crea una nueva rama derivada de 'develop' y luego cambia el código a esta rama.</p> <p>This action creates a new feature branch based on 'develop' and switches to it</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -191,16 +194,16 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Terminar una característica</h3> <h3>Finish up a feature</h3>
<p> <p>
Terminar el desarrollo de una característica. Finish the development of a feature.
Esta acción realiza lo siguiente: This action performs the following
</p> </p>
<ul> <ul>
<li>Fusiona MYFEATURE en 'develop'</li> <li>Merged MYFEATURE into 'develop'</li>
<li>Borra la rama MYFEATURE</li> <li>Removes the feature branch</li>
<li>Establece como versión de trabajo la rama 'develop'</li> <li>Switches back to 'develop' branch</li>
</ul> </ul>
<blockquote> <blockquote>
@ -214,11 +217,11 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Publicar una característica</h3> <h3>Publish a feature</h3>
<p> <p>
¿Estás trabajando colaborativamente? <br/> Are you developing a feature in collaboration? <br/>
Publica una característica a un servidor remoto para que así pueda ser vista por otros. Publish a feature to the remote server so it can be used by other users.
</p> </p>
<blockquote> <blockquote>
@ -232,15 +235,17 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Obteniendo características publicadas</h3> <h3>Getting a published feature</h3>
<p> <p>
Descarga una característica publicada por otro y mantiene un seguimiento de sus cambios. Get a feature published by another user.
</p> </p>
<blockquote> <blockquote>
git flow feature pull MYFEATURE git flow feature pull origin MYFEATURE
</blockquote> </blockquote>
<p>You can track a feature on origin by using <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>
@ -249,30 +254,29 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="release" href="#release">Publica una versión</a></h2> <h2><a name="release" href="#release">Make a release</a></h2>
<ul> <ul>
<li>Prepara una versión para producción</li> <li>Support preparation of a new production release</li>
<li>Permite arreglos menores y la preparación de los metadatos para la publicación</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>Comienza una publicación</h3> <h3>Start a release</h3>
<p>Para comenzar una publicación, usa el comando git flow release. Creará</p> <p>To start a release, use the git flow release command. It creates a release branch created from the 'develop' branch.</p>
una rama de publicación derivada de la rama 'develop'.
</p>
<blockquote> <blockquote>
git flow release start RELEASE [BASE] 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 <p>You can optionally supply a <code>[BASE]</code> commit sha-1 hash to start the release from. The commit must
publicación. El cambio debe ser parte de la rama 'develop'.</p> be on the
'develop' branch.</p>
<p class="divider">&#9733; &#9733; &#9733;</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> <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>
<blockquote> <blockquote>
git flow release publish RELEASE git flow release publish RELEASE
</blockquote> </blockquote>
<p>(Puede establecer el seguimiento de los cambios de la publicación remota utilizando el comando <br/><code>git flow release track RELEASE</code></p> <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>
@ -281,18 +285,20 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Concluir una publicación</h3> <h3>Finish up a release</h3>
<p>Dar cierre a una publicación es un gran paso. Realiza varias acciones:</p> <p>Finishing a release is one of the big steps in git branching. It performs several actions:</p>
<ul> <ul>
<li>Fusiona la rama de la publicación con la rama 'master'</li> <li>Merges the release branch back into 'master'</li>
<li>Etiqueta el cambio con su nombre</li> <li>Tags the release with its name</li>
<li>Vuelve a fusionar la publicación con la rama 'develop'</li> <li>Back-merges the release into 'develop'</li>
<li>Borra la rama de la publicación</li> <li>Removes the release branch</li>
</ul> </ul>
<blockquote> <blockquote>
git flow release finish RELEASE git flow release finish RELEASE
</blockquote> </blockquote>
<p>Don't forget to push your tags with<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>
@ -301,22 +307,22 @@
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">Revisiones</a></h2> <h2><a name="hotfixes" href="#hotfixes">Hotfixes</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>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version
</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> <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>Como otros comandos de git flow, una revisión se abre con</p> <p>Like the other git flow commands, a hotfix is started with</p>
<blockquote> <blockquote>
git flow hotfix start VERSION [BASENAME] git flow hotfix start VERSION [BASENAME]
</blockquote> </blockquote>
<p>El argumento de la versión determina el nombre de la revisión. Opcionalmente, puede agregar un nombre para la base desde la cual comenzar.</p> <p>The version argument hereby marks the new hotfix release name. 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>
@ -325,9 +331,9 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Cierra una revisión</h3> <h3>Finish a hotfix</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>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version.</p>
<blockquote> <blockquote>
git flow hotfix finish VERSION git flow hotfix finish VERSION
</blockquote> </blockquote>
@ -347,19 +353,20 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="commands" href="#commands">Comandos</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>Tareas pendientes</h2> <h2>Backlog</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>Not all available commands are covered here, only the most important ones</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>You can still use git and all its commands normally as you know them, git flow is only a tooling
collection
</li> </li>
<li>La característica 'support' aún esta en fase beta y no se recomienda usarla</li> <li>The 'support' feature is still beta, using it is not advised</li>
<li>Si quiere proveer traducciones, serán bien recibidas.</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>
@ -369,7 +376,7 @@
<footer> <footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Comentarios</a></h2> <h2><a name="comments" href="#comments">Comments</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>

159
index.fr_FR.html
View File

@ -33,7 +33,7 @@
<h1 id="title">git-flow cheatsheet</h1> <h1 id="title">git-flow cheatsheet</h1>
<p id="author"> <p id="author">
créé par <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 href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a>
<script>!function (d, s, id) { <script>!function (d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0]; var js, fjs = d.getElementsByTagName(s)[0];
@ -45,16 +45,17 @@
} }
}(document, "script", "twitter-wjs");</script> }(document, "script", "twitter-wjs");</script>
</p> </p>
<p id="desc">modèle de versionnement efficace utilisant git-flow par <a href="http://nvie.com/">Vincent Driessen</a></p> <p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p>
<p id="translations">traductions: <p id="translations">translations:
<a href="index.html" title="english">English</a> - <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">Brazilian Portugues</a> -
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - <a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
<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="#" class="active" title="Français">Français</a> - <a href="index.fr_FR.html" title="Français">Français</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.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> -
@ -67,36 +68,38 @@
<div class="scrollblock"> <div class="scrollblock">
<h2>A propos</h2> <h2>About</h2>
<p> <p>
git-flow est un ensemble d'extensions git permettant des opérations de haut niveau sur un dépot pour appliquer le modèle de branches de Vincent Driessen. git-flow are a set of git extensions to provide high-level repository operations for Vincent
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">détails</a></small> Driessen's branching model.
<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>Cet aide-mémoire montre l'utilisation et les effets des opérations git-flow</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>Conseils de base</h2> <h2>Basic tips</h2>
<ul> <ul>
<li>Les commandes et sorties de Git-flow apportent une aide précieuse. Lisez les attentivement pour comprendre ce qui se passe...</li> <li>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li>
<li>Le logiciel pour OSX <a href="http://www.sourcetreeapp.com/">Sourcetree</a> est une excellente interface graphique pour git qui supporte git-flow. <li>The OSX/Windows Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides
git-flow support
</li> </li>
<li>Git-flow est une solution basée sur les fusions (merge). Elle n'effectue pas de <em>rebase</em> sur les branches de fonctionnalitées</li> <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">Installation</a></h2> <h2><a name="setup" href="#setup">Setup</a></h2>
<ul> <ul>
<li>Une installation fonctionnelle de git est requise</li> <li>You need a working git installation as prerequisite.</li>
<li>Git flow fonctionne sur OSX, Linux et Windows</li> <li>Git flow works on OSX, Linux and 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">
@ -118,31 +121,31 @@
$ 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>Vous aurez besoin de wget et de util-linux pour installer 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>
Pour des instructions détaillées concernant l'installation de git-flow, consultez le For detailed git flow intallation instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow
<a href="https://github.com/nvie/gitflow/wiki/Windows">wiki git-flow</a>. 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">Premiers pas</a></h2> <h2><a name="getting_started" href="#getting_started">Getting started</a></h2>
<p>Git flow doit être initialisé afin de personnaliser la configuration de votre projet.</p> <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>Initialisation</h3> <h3>Initialize</h3>
<p>Commencez à utiliser git-flow en l'initialisant dans un dépot git existant:</p> <p>Start using git-flow by initializing it inside an existing git repository:</p>
<blockquote> <blockquote>
git flow init git flow init
</blockquote> </blockquote>
<p> <p>
Vous devrez répondre à quelques questions concernant les conventions de nommage pour vos branches.<br/> You'll have to answer a few questions regarding the naming conventions for your branches.<br/>
Il est recommandé d'utiliser les valeurs par défaut. It's recommended to use the default values.
</p> </p>
</div> </div>
@ -150,28 +153,28 @@
<div class="initialize"></div> <div class="initialize"></div>
<div class="lines-small"></div> <div class="lines-small"></div>
<div class="lines-open"></div> <div class="lines-open"></div>
<div class="lines-big" style="height:5200px"></div> <div class="lines-big"></div>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="features" href="#features">Fonctionnalités/Features</a></h2> <h2><a name="features" href="#features">Features</a></h2>
<ul class="narrow"> <ul class="narrow">
<li>Developpe des nouvelles fonctionnalités pour la prochaine version</li> <li>Develop new features for upcoming releases</li>
<li>Existe en général uniquement dans les dépots des développeurs</li> <li>Typically exist in developers repos only</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>Commencer une feature</h3> <h3>Start a new feature</h3>
<p>Le développement d'une fonctionnalité commence à partir de la branche 'develop'</p> <p>Development of new features starting from the 'develop' branch.</p>
<p>Commencer le développement d'une nouvelle fonctionnalité avec:</p> <p>Start developing a new feature with</p>
<blockquote> <blockquote>
git flow feature start MYFEATURE git flow feature start MYFEATURE
</blockquote> </blockquote>
<p>Cette commande crée une nouvelle branche de fonctionnalité basée sur 'develop' et passe sur cette branche</p> <p>This action creates a new feature branch based on 'develop' and switches to it</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -191,15 +194,16 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Terminer une fonctionnalité</h3> <h3>Finish up a feature</h3>
<p> <p>
Termine le développement d'une fonctionnalité. Finish the development of a feature.
Cette action effectue les opérations suivantes: This action performs the following
</p> </p>
<ul> <ul>
<li>fusionne MYFEATURE dans 'develop'</li> <li>Merged MYFEATURE into 'develop'</li>
<li>Supprime la branche de fonctionnalité</li> <li>Removes the feature branch</li>
<li>Passe sur la branche 'develop'</li> <li>Switches back to 'develop' branch</li>
</ul> </ul>
<blockquote> <blockquote>
@ -213,11 +217,11 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Publier une fonctionnalité</h3> <h3>Publish a feature</h3>
<p> <p>
Vous développez une fonctionnalité en collaboration? <br/> Are you developing a feature in collaboration? <br/>
Publiez une fonctionnalité sur le serveur distant pour qu'elle puisse être utilisée par d'autres utilisateurs. Publish a feature to the remote server so it can be used by other users.
</p> </p>
<blockquote> <blockquote>
@ -231,17 +235,17 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Récupérer une fonctionnalité publiée</h3> <h3>Getting a published feature</h3>
<p> <p>
Récupérer une fonctionnalité publiée par un autre utilisateur Get a feature published by another user.
</p> </p>
<blockquote> <blockquote>
git flow feature pull origin MYFEATURE git flow feature pull origin MYFEATURE
</blockquote> </blockquote>
<p>Vous pouvez suivre une fonctionnalité sur le serveur distant en utilisant <code> git flow feature track MYFEATURE</code> </p> <p>You can track a feature on origin by using <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>
@ -250,29 +254,29 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="release" href="#release">Livraison/Release</a></h2> <h2><a name="release" href="#release">Make a release</a></h2>
<ul> <ul>
<li>Prépare la sortie d'une nouvelle version de production</li> <li>Support preparation of a new production release</li>
<li>Permet les corrections de bugs mineurs et la préparation des métadonnées de la 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>Commencer une livraison</h3> <h3>Start a release</h3>
<p>Pour commencer une livraison, utilisez la commande git-flow release</p> <p>To start a release, use the git flow release command. It creates a release branch created from the 'develop' branch.</p>
créer une branche de livraison basée sur la branche de développement.
</p>
<blockquote> <blockquote>
git flow release start RELEASE [BASE] git flow release start RELEASE [BASE]
</blockquote> </blockquote>
<p>Vous pouvez si besoin ajouter le paramètre <code>[BASE]</code>, le hash d'un commit à partir duquel commencera la livraison. Ce commit doit faire partie de la branche de développement.</p> <p>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>Il est préférable de publier la branche de livraison après l'avoir créée pour permettre aux autres développeurs de commiter dessus. De la même manière que pour les fonctionnalités, utilisez cette commande:</p> <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>
<blockquote> <blockquote>
git flow release publish RELEASE git flow release publish RELEASE
</blockquote> </blockquote>
<p>Vous pouvez suivre une livraison sur le serveur distant en utilisant <br/><code>git flow release track RELEASE</code></p> <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>
@ -281,19 +285,19 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Terminer une livraison</h3> <h3>Finish up a release</h3>
<p>Terminer une livraison est une des étapes majeures de cette méthode. Plusieurs actions sont réalisées:</p> <p>Finishing a release is one of the big steps in git branching. It performs several actions:</p>
<ul> <ul>
<li>Fusionne la branche de livraison dans la branche 'master'</li> <li>Merges the release branch back into 'master'</li>
<li>Etiquette la livraison par son nom</li> <li>Tags the release with its name</li>
<li>Fusionne la livraison dans la branche 'develop'</li> <li>Back-merges the release into 'develop'</li>
<li>Supprime la branche de livraison</li> <li>Removes the release branch</li>
</ul> </ul>
<blockquote> <blockquote>
git flow release finish RELEASE git flow release finish RELEASE
</blockquote> </blockquote>
<p>N'oubliez pas de pousser vos étiquettes avec <code>git push --tags</code></p> <p>Don't forget to push your tags with<code>git push --tags</code></p>
</div> </div>
<div class="col-2"> <div class="col-2">
@ -303,22 +307,22 @@
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">Correctifs/Hotfixes</a></h2> <h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
<ul> <ul>
<li>Les correctifs sont utiles quand il est nécessaire de corriger immédiatement l'état incorrect de la version en production <li>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version
</li> </li>
<li>Ils peuvent se baser sur l'étiquette de la branche 'master' indiquant la version en production.</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>Commencer un hotfix</h3> <h3>git flow hotfix start</h3>
<p>Comme pour les autres commandes git-flow, un hotfix est commencé par</p> <p>Like the other git flow commands, a hotfix is started with</p>
<blockquote> <blockquote>
git flow hotfix start VERSION [BASENAME] git flow hotfix start VERSION [BASENAME]
</blockquote> </blockquote>
<p>ici, le paramètre VERSION indique le nom de la future release corrigée. Vous pouvez si besoin spécifier à quelle release s'appliquera le hotfix.</p> <p>The version argument hereby marks the new hotfix release name. 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>
@ -327,9 +331,9 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Terminer un hotfix</h3> <h3>Finish a hotfix</h3>
<p>En terminant un hotfix, il est fusionné dans les branches 'develop' et 'master'. De plus la fusion vers 'master' est etiquetée par la version du hotfix.</p> <p>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version.</p>
<blockquote> <blockquote>
git flow hotfix finish VERSION git flow hotfix finish VERSION
</blockquote> </blockquote>
@ -349,19 +353,20 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="commands" href="#commands">Commandes</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>En suspens</h2> <h2>Backlog</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Toutes les commandes disponibles ne sont pas abordées ici, seulement les principales</li> <li>Not all available commands are covered here, only the most important ones</li>
<li>Vous pouvez toujours utiliser normalement git et toutes ses commandes telles que vous les connaissez, git flow est seulement un ensemble d'outils supplémentaires <li>You can still use git and all its commands normally as you know them, git flow is only a tooling
collection
</li> </li>
<li>la fonction 'support' est encore en version bêta, il n'est pas conseillé de l'utiliser</li> <li>The 'support' feature is still beta, using it is not advised</li>
<li>Si vous voulez ajouter des traductions de ce document, je les intégrerai avec plaisir</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>
@ -371,7 +376,7 @@
<footer> <footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Commentaires</a></h2> <h2><a name="comments" href="#comments">Comments</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>

1
index.html
View File

@ -50,6 +50,7 @@
<a href="#" class="active" title="english">English</a> - <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">Brazilian Portugues</a> -
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - <a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
<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> -

150
index.it_IT.html
View File

@ -27,13 +27,13 @@
</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"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
<header> <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> 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 href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a>
<script>!function (d, s, id) { <script>!function (d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0]; var js, fjs = d.getElementsByTagName(s)[0];
@ -45,17 +45,18 @@
} }
}(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">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p>
<p id="translations">traduzioni: <p id="translations">translations:
<a href="index.html" title="english">English</a> - <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">Brazilian Portugues</a> -
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - <a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
<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="#" title="Italiano" class="active">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> -
@ -67,27 +68,28 @@
<div class="scrollblock"> <div class="scrollblock">
<h2>Introduzione</h2> <h2>About</h2>
<p> <p>
git-flow è un set di estensioni di git che offre dei comandi di alto livello sul repository per utilizzare il modello di branching di Vincent git-flow are a set of git extensions to provide high-level repository operations for Vincent
Driessen. Driessen's branching model.
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">maggiori informazioni</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>Questo cheatsheet mostra l'utilizzo di base a gli effetti dei comandi offerti da git-flow</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>Consigli di base</h2> <h2>Basic tips</h2>
<ul> <ul>
<li>Git flow offre un eccelente guida e un ottimo output da linea di comando. Leggeteli attentamente per vedere cosa sta succedendo...</li> <li>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li>
<li>Il Client per OSX/Windows <a href="http://www.sourcetreeapp.com/">Sourcetree</a> è un'eccellente GUI per git e offre supporto per git-flow <li>The OSX/Windows Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides
git-flow support
</li> </li>
<li>Git-flow è una soluzione basata sul merge. Non esegue il rebase su i feature branch.</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>
@ -96,8 +98,8 @@
<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>È necessario un'installazione di git funzionante come prerequisito.</li> <li>You need a working git installation as prerequisite.</li>
<li>Git flow funziona su OSX, Linux e Windows</li> <li>Git flow works on OSX, Linux and 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">
@ -119,30 +121,31 @@
$ 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>Sono necessari wget e util-linux per installare 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>
Per le istruzioni dettagliate riguardo l'installazione di git-flow visitate il <a href="https://github.com/nvie/gitflow/wiki/Windows">wiki di git flow</a>. For detailed git flow intallation instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">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">Per Iniziare</a></h2> <h2><a name="getting_started" href="#getting_started">Getting started</a></h2>
<p>Git flow ha la necessità di essere inizializzato per personalizzare il setup del progetto.</p> <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>Inizializzazione</h3> <h3>Initialize</h3>
<p>Iniziate ad utilizzare git-flow inizializzandolo all'interno di un repository git esistente:</p> <p>Start using git-flow by initializing it inside an existing git repository:</p>
<blockquote> <blockquote>
git flow init git flow init
</blockquote> </blockquote>
<p> <p>
Dovrete rispondere ad alcune domande riguardanti la naming conventions per i tuoi branch.<br/> You'll have to answer a few questions regarding the naming conventions for your branches.<br/>
Si raccomanda l'uso dei valori di default. It's recommended to use the default values.
</p> </p>
</div> </div>
@ -156,22 +159,22 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="features" href="#features">Features (Funzionalità)</a></h2> <h2><a name="features" href="#features">Features</a></h2>
<ul class="narrow"> <ul class="narrow">
<li>Sviluppare nuove features per le releases in arrivo</li> <li>Develop new features for upcoming releases</li>
<li>Generalmente sono presenti solo nei repository di sviluppo</li> <li>Typically exist in developers repos only</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 nuova feature</h3> <h3>Start a new feature</h3>
<p>Lo sviluppo di nuove feature cominica dal branch 'develop'.</p> <p>Development of new features starting from the 'develop' branch.</p>
<p>Iniziate lo sviluppo di una nuova feature con</p> <p>Start developing a new feature with</p>
<blockquote> <blockquote>
git flow feature start MYFEATURE git flow feature start MYFEATURE
</blockquote> </blockquote>
<p>Questa crea un nuovo feature branch basato su 'develop' e si sposta su quello</p> <p>This action creates a new feature branch based on 'develop' and switches to it</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -191,16 +194,16 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Terminare una feature</h3> <h3>Finish up a feature</h3>
<p> <p>
Termina lo sviluppo di una feature. Finish the development of a feature.
Questa azione esegue le seguenti operazioni This action performs the following
</p> </p>
<ul> <ul>
<li>Merge del branch MYFEATURE all'inteno di 'develop'</li> <li>Merged MYFEATURE into 'develop'</li>
<li>Rimuove il feature branch</li> <li>Removes the feature branch</li>
<li>Si sposta di nuovo sul branch 'develop'</li> <li>Switches back to 'develop' branch</li>
</ul> </ul>
<blockquote> <blockquote>
@ -214,11 +217,11 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Pubblicare una feature</h3> <h3>Publish a feature</h3>
<p> <p>
State sviluppando una feature in collaborazione con altri?<br/> Are you developing a feature in collaboration? <br/>
Pubblicate una feature sul server remoto in modo che possa essere utilizzata da altri utenti. Publish a feature to the remote server so it can be used by other users.
</p> </p>
<blockquote> <blockquote>
@ -232,17 +235,17 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Scaricare una feature pubblicata</h3> <h3>Getting a published feature</h3>
<p> <p>
Scaricare una feature pubblicata da un altro utente. Get a feature published by another user.
</p> </p>
<blockquote> <blockquote>
git flow feature pull origin MYFEATURE git flow feature pull origin MYFEATURE
</blockquote> </blockquote>
<p>Potete tracciare una feature sul repository origin usando <code> git flow feature track MYFEATURE</code> </p> <p>You can track a feature on origin by using <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>
@ -251,28 +254,29 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="release" href="#release">Creare una release</a></h2> <h2><a name="release" href="#release">Make a release</a></h2>
<ul> <ul>
<li>Supporto alla preparazione di una nuova release di produzione</li> <li>Support preparation of a new production release</li>
<li>Consente di eseguire bug fixes minori e preparare i meta-dati per la 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>Iniziare una release</h3> <h3>Start a release</h3>
<p>Per iniziare una release usate il comando release di git flow. Crea un release branch a partire dal branch 'develop'. <p>To start a release, use the git flow release command. It creates a release branch created from the 'develop' branch.</p>
</p>
<blockquote> <blockquote>
git flow release start RELEASE [BASE] git flow release start RELEASE [BASE]
</blockquote> </blockquote>
<p>Potere facoltativmente fornire come parametro <code>[BASE]</code> lo sha-1 hash del commit dal quale far partire la release. Il commit deve essere sul branch 'develop'.</p> <p>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>È una buona idea pubblicare il release branch dopo averlo creato in modo da consentire l'invio di release commit anche da parte di altri sviluppatori. Potete farlo, usando un comando analogo a quello per pubblicare le features, con il comando:</p> <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>
<blockquote> <blockquote>
git flow release publish RELEASE git flow release publish RELEASE
</blockquote> </blockquote>
<p>(Potete tracciare la release remota con il comando <code>git flow release track RELEASE</code>)</p> <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>
@ -281,19 +285,19 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Terminare una release</h3> <h3>Finish up a release</h3>
<p>Terminare una release è uno dei passi più grandi nella gestione dei branch di git. Vengono eseguite svariate operazioni:</p> <p>Finishing a release is one of the big steps in git branching. It performs several actions:</p>
<ul> <ul>
<li>Merge del release branch su branch 'master'</li> <li>Merges the release branch back into 'master'</li>
<li>Tag della relase con il suo nome</li> <li>Tags the release with its name</li>
<li>Merge all'indietro della relase sul branch 'develop'</li> <li>Back-merges the release into 'develop'</li>
<li>Rimozione del release branch</li> <li>Removes the release branch</li>
</ul> </ul>
<blockquote> <blockquote>
git flow release finish RELEASE git flow release finish RELEASE
</blockquote> </blockquote>
<p>Non dimenticate di fare il push dei tag creati con <code>git push --tags</code></p> <p>Don't forget to push your tags with<code>git push --tags</code></p>
</div> </div>
<div class="col-2"> <div class="col-2">
@ -306,18 +310,19 @@
<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 agire immediatamente di fronte ad uno stato indesiderato della versione live di produzione.</li> <li>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version
<li>Possono essere fatti partire dal tag corrispondente sul branch master che contrassegna la versione di produzione.</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>Come gli altri comandi di git flow, un hotfix comincia con</p> <p>Like the other git flow commands, a hotfix is started with</p>
<blockquote> <blockquote>
git flow hotfix start VERSION [BASENAME] git flow hotfix start VERSION [BASENAME]
</blockquote> </blockquote>
<p>La versione passata come argomento definisce il nuovo nome dell'hotfix release. Facoltativamente potete specificare un basename da cui partire.</p> <p>The version argument hereby marks the new hotfix release name. 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>
@ -326,9 +331,9 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Terminare un hotfix</h3> <h3>Finish a hotfix</h3>
<p>Terminando un hotfix, esso viene integrato (merge) all'indietro all'interno di 'develop' e di 'master'. In aggiunta il master viene taggato con la versone dell'hotfix.</p> <p>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version.</p>
<blockquote> <blockquote>
git flow hotfix finish VERSION git flow hotfix finish VERSION
</blockquote> </blockquote>
@ -348,7 +353,7 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="commands" href="#commands">Comandi</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>
@ -356,11 +361,12 @@
<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 disponibili sono riportati qui, solo i più importanti</li> <li>Not all available commands are covered here, only the most important ones</li>
<li>Potete comunque usare git e tutti i suoi comandi normalmente come li conoscete, git flow è solo una collezione di strumenti aggiuntivi. <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>La funzionalità 'support' è ancora in beta, 'utilizzo non è consigliato</li> <li>The 'support' feature is still beta, using it is not advised</li>
<li>Se volete fornire una traduzione sarò felice di integrarla</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>
@ -370,7 +376,7 @@
<footer> <footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Commenti</a></h2> <h2><a name="comments" href="#comments">Comments</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>

130
index.ja_JP.html
View File

@ -47,11 +47,12 @@
</p> </p>
<p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p> <p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p>
<p id="translations">translations: <p id="translations">translations:
<a href="index.html" title="english">English</a> - <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">Brazilian Portugues</a> -
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - <a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
<a href="#" class="active" 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> -
@ -70,12 +71,13 @@
<h2>About</h2> <h2>About</h2>
<p> <p>
git-flowはgitの拡張であり、Vincent Driessenの提唱するブランチモデルを実現するための高度なリポジトリ操作を提供します。 git-flow are a set of git extensions to provide high-level repository 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>このチートシートは基本的な使い方とgit-flowの効果を表します。</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>
@ -83,9 +85,11 @@
<div class="scrollblock"> <div class="scrollblock">
<h2>Basic tips</h2> <h2>Basic tips</h2>
<ul> <ul>
<li>Git flow は素晴らしいコマンドライン補助と出力を提供します。何が起こるか注意深く読み解いてください。</li> <li>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li>
<li>OSX Clientの <a href="http://www.sourcetreeapp.com/">Sourcetree</a> は素晴らしいGUIとgit-flowサポートを提供します。</li> <li>The OSX/Windows Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides
<li>- Git-flow はマージすることをベースとして考えるソリューションです。リベースは行いません。</li> git-flow support
</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>
@ -94,8 +98,8 @@
<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>You need a working git installation as prerequisite.</li>
<li>Git flow はOSX、Linux、Windowsで動作します。</li> <li>Git flow works on OSX, Linux and 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">
@ -117,11 +121,11 @@
$ 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>git-flowのインストールには、wgetとutil-linuxが必要です。</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>
詳細なgit flowのインストール方法は以下のサイトを参考にしてください。 <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow For detailed git flow intallation instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow
wiki</a>. wiki</a>.
</p> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow"/>
@ -130,18 +134,18 @@
<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 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>初期化</h3> <h3>Initialize</h3>
<p>通常のgitリポジトリ配下に移動した後、下記のコマンドでgit-flow化します。</p> <p>Start using git-flow by initializing it inside an existing git repository:</p>
<blockquote> <blockquote>
git flow init git flow init
</blockquote> </blockquote>
<p> <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.
</p> </p>
</div> </div>
@ -158,18 +162,19 @@
<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>Develop new features for upcoming releases</li>
<li>基本的には開発者のリポジトリのみに行います。</li> <li>Typically exist in developers repos only</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>Start a new feature</h3>
<p>開発用ブランチは 'develop' ブランチから開始します。開始方法は、</p> <p>Development of new features starting from the 'develop' branch.</p>
<p>Start developing a new feature with</p>
<blockquote> <blockquote>
git flow feature start MYFEATURE git flow feature start MYFEATURE
</blockquote> </blockquote>
<p>新たな開発用ブランチを'develop'ブランチをベースとして作成し、開発用ブランチにスイッチします。</p> <p>This action creates a new feature branch based on 'develop' and switches to it</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -189,15 +194,16 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>開発終了</h3> <h3>Finish up a feature</h3>
<p> <p>
開発が終了したらコマンドで以下の操作が行われます。 Finish the development of a feature.
This action performs the following
</p> </p>
<ul> <ul>
<li>MYFEATUREブランチを'develop'にマージします。</li> <li>Merged MYFEATURE into 'develop'</li>
<li>開発用ブランチを削除します。</li> <li>Removes the feature branch</li>
<li>そして、'develop'ブランチにスイッチをします。</li> <li>Switches back to 'develop' branch</li>
</ul> </ul>
<blockquote> <blockquote>
@ -211,11 +217,11 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>開発分をリモートへ</h3> <h3>Publish a feature</h3>
<p> <p>
複数人と同じ開発ブランチで作業するときは、 Are you developing a feature in collaboration? <br/>
自分の変更分をリモートサーバにプッシュします。 Publish a feature to the remote server so it can be used by other users.
</p> </p>
<blockquote> <blockquote>
@ -229,15 +235,17 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>修正分を取り込む</h3> <h3>Getting a published feature</h3>
<p> <p>
他の人の修正分を自分のローカルにプルします。 Get a feature published by another user.
</p> </p>
<blockquote> <blockquote>
git flow feature pull MYFEATURE git flow feature pull origin MYFEATURE
</blockquote> </blockquote>
<p>You can track a feature on origin by using <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>
@ -249,26 +257,26 @@
<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>Support preparation of a new production release</li>
<li>軽微なバグフィックスを行ったり、リリースのため作業を行います。</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>リリース準備開始</h3> <h3>Start a release</h3>
<p>リリース作業を開始するには、git flowのreleaseコマンドを使います</p> <p>To start a release, use the git flow release command. It creates a release branch created from the 'develop' branch.</p>
'develop'ブランチから'release'ブランチを作成します
</p>
<blockquote> <blockquote>
git flow release start RELEASE [BASE] git flow release start RELEASE [BASE]
</blockquote> </blockquote>
<p><code>[BASE]</code>はオプションで 'develop'ブランチの特定のCommitのハッシュ値を指定します。指定がない場合はHEADが使われます。</p> <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>'release'ブランチ作成後に修正をプッシュするには、'feature'の時と似たコマンドを使用します:</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>
<blockquote> <blockquote>
git flow release publish RELEASE git flow release publish RELEASE
</blockquote> </blockquote>
<p>('release'リポジトリの修正のトラッキングをすることもできます<br/><code>git flow release track RELEASE</code> )</p> <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>
@ -277,18 +285,20 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>リリース準備完了</h3> <h3>Finish up a release</h3>
<p>リリース準備の終了作業は、gitのリポジトリが大きく変化します:</p> <p>Finishing a release is one of the big steps in git branching. It performs several actions:</p>
<ul> <ul>
<li>'release'ブランチを'master'にマージします。</li> <li>Merges the release branch back into 'master'</li>
<li>'master'ブランチにリリース用のタグをつけます。</li> <li>Tags the release with its name</li>
<li>'develop'ブランチに'release'ブランチの内容がマージされます。</li> <li>Back-merges the release into 'develop'</li>
<li>'release'ブランチが削除されます。</li> <li>Removes the release branch</li>
</ul> </ul>
<blockquote> <blockquote>
git flow release finish RELEASE git flow release finish RELEASE
</blockquote> </blockquote>
<p>Don't forget to push your tags with<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>
@ -300,19 +310,19 @@
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2> <h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
<ul> <ul>
<li>すぐに適用しなければいけないような、緊急の場合に使用します。</li> <li>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version
<li>'master'ブランチのタグから、緊急対応用のブランチを作成します。</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>緊急対応の開始</h3> <h3>git flow hotfix start</h3>
<p>他のgit flowコマンドと似た形で、hotfixを開始します</p> <p>Like the other git flow commands, a hotfix is started with</p>
<blockquote> <blockquote>
git flow hotfix start VERSION [BASENAME] git flow hotfix start VERSION [BASENAME]
</blockquote> </blockquote>
<p>バージョンの引数は、ホットフィックスリリース名を指定します。 オプションとして開始するベースを指定出来ます。</p> <p>The version argument hereby marks the new hotfix release name. Optionally you can specify a basename to start from.</p>
<p></p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
@ -321,9 +331,9 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>緊急対応の終了</h3> <h3>Finish a hotfix</h3>
<p>緊急対応の終了作業は、'develop'と'master'のブランチをマージします。加えて、'master'ブランチは緊急対応のタグが付けられます。</p> <p>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version.</p>
<blockquote> <blockquote>
git flow hotfix finish VERSION git flow hotfix finish VERSION
</blockquote> </blockquote>
@ -351,10 +361,12 @@
<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>Not all available commands are covered here, only the most important ones</li>
<li>もちろん、gitのコマンドは通常通りすべて使用することができます。git flowは単にgitのコマンドの集合です。 </li> <li>You can still use git and all its commands normally as you know them, git flow is only a tooling
<li>'support'ブランチの機能はまだベータ版です。それについては言及できません。</li> collection
<li>もし翻訳して頂けるなら、統合してもらえると幸いです。</li> </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>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>

133
index.ko_KR.html
View File

@ -47,13 +47,14 @@
</p> </p>
<p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p> <p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p>
<p id="translations">translations: <p id="translations">translations:
<a href="index.html" title="english">English</a> - <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">Brazilian Portugues</a> -
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - <a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
<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="#" class="active" 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.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> -
@ -70,12 +71,13 @@
<h2>About</h2> <h2>About</h2>
<p> <p>
git-flow는 Vincent Driessen의 브랜칭 모델을 위한 고수준 저장소 작업을 제공하는 git의 확장입니다. git-flow are a set of git extensions to provide high-level repository 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>이 치트 시트는 기본적인 사용법과 git-flow 작업의 효과를 보여줍니다.</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>
@ -83,9 +85,11 @@
<div class="scrollblock"> <div class="scrollblock">
<h2>Basic tips</h2> <h2>Basic tips</h2>
<ul> <ul>
<li>Git flow는 훌륭한 명령행 도움말과 출력을 제공합니다. 무슨 일이 일어나는지를 알려면 출력을 주의깊게 읽어주세요.</li> <li>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li>
<li>OSX/Window Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a>는 훌륭한 git gui를 제공하고 git-flow에 대한 지원을 제공합니다.</li> <li>The OSX/Windows Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides
<li>Git-flow는 병합(merge) 기반의 솔루션입니다. feature 브랜치를 리베이스(rebase)하지 않습니다.</li> git-flow support
</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>
@ -94,8 +98,8 @@
<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>You need a working git installation as prerequisite.</li>
<li>Git flow는 OSX, Linux, Windows에서 동작합니다.</li> <li>Git flow works on OSX, Linux and 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">
@ -117,11 +121,12 @@
$ 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>git-flow의 설치를 위해서는 wget과 util-linux가 필요합니다.</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>
상세한 git flow의 설치 방법은 <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow wiki</a>를 참고하세요. For detailed git flow intallation instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">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>
@ -129,18 +134,18 @@
<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 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>초기화</h3> <h3>Initialize</h3>
<p>기존 git 저장소 내에서 초기화하는 것으로 git-flow의 사용을 시작합니다</p> <p>Start using git-flow by initializing it inside an existing git repository:</p>
<blockquote> <blockquote>
git flow init git flow init
</blockquote> </blockquote>
<p> <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.
</p> </p>
</div> </div>
@ -157,19 +162,19 @@
<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>Develop new features for upcoming releases</li>
<li>일반적으로 개발자의 저장소에만 존재합니다.</li> <li>Typically exist in developers repos only</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>새 기능(feature) 시작하기</h3> <h3>Start a new feature</h3>
<p>새 기능의 개발은 'develop' 브랜치에서 시작합니다.</p> <p>Development of new features starting from the 'develop' branch.</p>
<p>다음과 같이 새 기능의 개발을 시작합니다.</p> <p>Start developing a new feature with</p>
<blockquote> <blockquote>
git flow feature start MYFEATURE git flow feature start MYFEATURE
</blockquote> </blockquote>
<p>이것은 'develop'에 기반한 새 기능(feature) 브랜치를 생성하고 그 브랜치로 전환합니다.</p> <p>This action creates a new feature branch based on 'develop' and switches to it</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -189,16 +194,16 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>기능 완료</h3> <h3>Finish up a feature</h3>
<p> <p>
기능 개발을 완료합니다. Finish the development of a feature.
이것은 다음 작업들을 수행합니다. This action performs the following
</p> </p>
<ul> <ul>
<li>MYFEATURE 브랜치를 'develop'에 병합(merge)합니다.</li> <li>Merged MYFEATURE into 'develop'</li>
<li>기능 브랜치를 삭제합니다.</li> <li>Removes the feature branch</li>
<li>'develop' 브랜치로 전환합니다.</li> <li>Switches back to 'develop' branch</li>
</ul> </ul>
<blockquote> <blockquote>
@ -212,11 +217,11 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>기능을 게시(publish)</h3> <h3>Publish a feature</h3>
<p> <p>
기능을 공동으로 개발하고 있나요? <br/> Are you developing a feature in collaboration? <br/>
기능을 원격 서버에 게시하여 다른 사용자들도 사용할 수있게 합니다. Publish a feature to the remote server so it can be used by other users.
</p> </p>
<blockquote> <blockquote>
@ -230,15 +235,17 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>게시된 기능 가져오기</h3> <h3>Getting a published feature</h3>
<p> <p>
다른 사용자가 게시한 기능을 가져오고 원격 변경을 추적합니다. Get a feature published by another user.
</p> </p>
<blockquote> <blockquote>
git flow feature pull MYFEATURE git flow feature pull origin MYFEATURE
</blockquote> </blockquote>
<p>You can track a feature on origin by using <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>
@ -250,26 +257,26 @@
<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>Support preparation of a new production release</li>
<li>출시를 위한 사소한 버그 수정이나 메타 데이터 준비를 허용합니다.</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>릴리스 시작</h3> <h3>Start a release</h3>
<p>릴리스를 시작하려면 git flow의 release 명령을 사용합니다.</p> <p>To start a release, use the git flow release command. It creates a release branch created from the 'develop' branch.</p>
'develop' 브랜치로부터 'release' 브랜치를 생성합니다.
</p>
<blockquote> <blockquote>
git flow release start RELEASE [BASE] git flow release start RELEASE [BASE]
</blockquote> </blockquote>
<p>릴리스를 시작할 <code>[BASE]</code> commit sha-1 해시를 선택적으로 줄 수도 있습니다. 그 commit은 반드시 'develop' 브랜치에 있어야합니다.</p> <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>릴리스 브랜치를 생성한 후에는 다른 개발자들의 릴리스 commit을 허용하기위해 게시(publish)하는 것이 현명합니다. 기능 게시와 비슷한 방법으로합니다:</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>
<blockquote> <blockquote>
git flow release publish RELEASE git flow release publish RELEASE
</blockquote> </blockquote>
<p>(원격 'release' 브랜치의 변경 추적은 다음과 같이 합니다<br/><code>git flow release track RELEASE</code> )</p> <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>
@ -278,19 +285,19 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>릴리스 완료</h3> <h3>Finish up a release</h3>
<p>릴리스 완료는 git 브랜치하기에서 가장 큰 단계입니다. 몇몇 작업을 수행합니다:</p> <p>Finishing a release is one of the big steps in git branching. It performs several actions:</p>
<ul> <ul>
<li>'release' 브랜치를 'master' 브랜치에 병합(merge)</li> <li>Merges the release branch back into 'master'</li>
<li>릴리스를 릴리스 이름으로 태그(tag)</li> <li>Tags the release with its name</li>
<li>릴리스를 'develop' 브랜치로 재병합(back-merge)</li> <li>Back-merges the release into 'develop'</li>
<li>'release' 브랜치 삭제</li> <li>Removes the release branch</li>
</ul> </ul>
<blockquote> <blockquote>
git flow release finish RELEASE git flow release finish RELEASE
</blockquote> </blockquote>
<p><code>git push --tags</code>를 사용해 태그들을 push하는 것을 잊지마세요.</p> <p>Don't forget to push your tags with<code>git push --tags</code></p>
</div> </div>
<div class="col-2"> <div class="col-2">
@ -303,19 +310,19 @@
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2> <h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
<ul> <ul>
<li>핫픽스는 현재 출시된 제품에 문제가 생겨서 즉각 대응해야하는 상황에서 필요합니다.</li> <li>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version
<li>'master' 브랜치의 현재 출시된 버전으로 표기(mark)된 태그(tag)로부터 브랜치를 땁니다.</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>핫픽스 시작</h3> <h3>git flow hotfix start</h3>
<p>여타 git flow 명령과 비슷한 방법으로 시작합니다.</p> <p>Like the other git flow commands, a hotfix is started with</p>
<blockquote> <blockquote>
git flow hotfix start VERSION [BASENAME] git flow hotfix start VERSION [BASENAME]
</blockquote> </blockquote>
<p>여기서 버전 인수는 핫픽스 릴리스 이름을 지정합니다. 선택적으로 basename으로 시작점을 지정할 수도 있습니다.</p> <p>The version argument hereby marks the new hotfix release name. Optionally you can specify a basename to start from.</p>
<p></p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
@ -324,9 +331,9 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>핫픽스 완료</h3> <h3>Finish a hotfix</h3>
<p>핫픽스를 종료하면 핫픽스는 'develop' 및 'master' 브랜치로 병합(merge)됩니다. 추가적으로 'master'의 병합분분은 핫픽스 버전으로 태그됩니다.</p> <p>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version.</p>
<blockquote> <blockquote>
git flow hotfix finish VERSION git flow hotfix finish VERSION
</blockquote> </blockquote>
@ -354,10 +361,12 @@
<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>Not all available commands are covered here, only the most important ones</li>
<li>git 명령도 사용할 수 있습니다. git flow는 단지 도구 모음일 뿐입니다.</li> <li>You can still use git and all its commands normally as you know them, git flow is only a tooling
<li>'support' 기능은 아직 베타 버전입니다. 사용은 권장되지 않습니다.</li> collection
<li>번역해주신다면 저는 행복하게 통합할 것입니다.</li> </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>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>

149
index.nl_NL.html
View File

@ -33,7 +33,7 @@
<h1 id="title">git-flow cheatsheet</h1> <h1 id="title">git-flow cheatsheet</h1>
<p id="author"> <p id="author">
gemaakt door <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 href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a>
<script>!function (d, s, id) { <script>!function (d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0]; var js, fjs = d.getElementsByTagName(s)[0];
@ -45,18 +45,20 @@
} }
}(document, "script", "twitter-wjs");</script> }(document, "script", "twitter-wjs");</script>
</p> </p>
<p id="desc">efficient branchen met behulp van git-flow door <a href="http://nvie.com/">Vincent Driessen</a></p> <p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p>
<p id="translations">vertalingen: <p id="translations">translations:
<a href="index.html" title="english">English</a> - <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">Brazilian Portugues</a> -
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - <a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
<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.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="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
<a href="index.de_DE.html" title="German">Deutsch (German)</a> - <a href="index.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>
</p> </p>
@ -66,38 +68,38 @@
<div class="scrollblock"> <div class="scrollblock">
<h2>Over</h2> <h2>About</h2>
<p> <p>
git-flow is een set van git extensies voor high-level repository operaties voor Vincent git-flow are a set of git extensions to provide high-level repository operations for Vincent
Driessen's branching model. Driessen's branching model.
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">meer</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>Dit cheatsheet laat het basisgebruik en de effecten zien van git-flow operaties</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>Basistips</h2> <h2>Basic tips</h2>
<ul> <ul>
<li>Git flow biedt uitstekende commandline hulp en output. Lees het zorgvuldig om te zien wat er gebeurt...</li> <li>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li>
<li>Het OSX/Windows programma <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is een uitstekende grafische git interface en biedt <li>The OSX/Windows Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides
git-flow ondersteuning git-flow support
</li> </li>
<li>Git-flow is een op merge gebaseerde oplossing. Het rebaset feature branches niet.</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">Installatie</a></h2> <h2><a name="setup" href="#setup">Setup</a></h2>
<ul> <ul>
<li>Je hebt een werkende git installatie nodig.</li> <li>You need a working git installation as prerequisite.</li>
<li>Git flow werkt op OSX, Linux en Windows</li> <li>Git flow works on OSX, Linux and 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">
@ -119,11 +121,11 @@
$ 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>Je hebt wget en util-linux nodig om git-flow te installeren.</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>
Gedetailleerde installatie instructies voor git flow kun je vinden op de<a href="https://github.com/nvie/gitflow/wiki/Windows">git flow For detailed git flow intallation instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow
wiki</a>. wiki</a>.
</p> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow"/>
@ -131,19 +133,19 @@
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">Aan de slag</a></h2> <h2><a name="getting_started" href="#getting_started">Getting started</a></h2>
<p>Git flow moet geinitializeerd zijn om je project setup aan te passen.</p> <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>Initializatie</h3> <h3>Initialize</h3>
<p>Je kan git-flow initializeren door het volgende commando in een bestaande git repository uit te voeren:</p> <p>Start using git-flow by initializing it inside an existing git repository:</p>
<blockquote> <blockquote>
git flow init git flow init
</blockquote> </blockquote>
<p> <p>
Je dient een paar vragen te beantwoorden over de naamgevingsconventies voor je branches.<br/> You'll have to answer a few questions regarding the naming conventions for your branches.<br/>
Het is aanbevolen om de standaard waarden te gebruiken. It's recommended to use the default values.
</p> </p>
</div> </div>
@ -160,19 +162,19 @@
<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>Ontwikkel nieuwe features voor aankomende releases</li> <li>Develop new features for upcoming releases</li>
<li>Bestaat typisch alleen in de repository van de ontwikkelaar</li> <li>Typically exist in developers repos only</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>Een nieuwe feature starten</h3> <h3>Start a new feature</h3>
<p>Nieuwe features hebben de 'develop' branch als uitgangspunt.</p> <p>Development of new features starting from the 'develop' branch.</p>
<p>Start met ontwikkelen van een nieuwe feature met</p> <p>Start developing a new feature with</p>
<blockquote> <blockquote>
git flow feature start MYFEATURE git flow feature start MYFEATURE
</blockquote> </blockquote>
<p>Deze actie maakt een nieuwe feature branch gebaseerd op 'develop' en schakelt over naar deze</p> <p>This action creates a new feature branch based on 'develop' and switches to it</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -192,16 +194,16 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Het afronden van een feature</h3> <h3>Finish up a feature</h3>
<p> <p>
Rond de ontwikkeling van een feature af. Finish the development of a feature.
Deze actie voert de volgende stappen uit This action performs the following
</p> </p>
<ul> <ul>
<li>Merge MYFEATURE in 'develop'</li> <li>Merged MYFEATURE into 'develop'</li>
<li>Verwijdert de feature branch</li> <li>Removes the feature branch</li>
<li>Schakelt terug naar de 'develop' branch</li> <li>Switches back to 'develop' branch</li>
</ul> </ul>
<blockquote> <blockquote>
@ -215,11 +217,11 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Een feature publiceren</h3> <h3>Publish a feature</h3>
<p> <p>
Ontwikkel je de feature samen met anderen? <br/> Are you developing a feature in collaboration? <br/>
Publiceer de feature branch dan naar de remote server zodat anderen deze branch ook kunnen gebruiken. Publish a feature to the remote server so it can be used by other users.
</p> </p>
<blockquote> <blockquote>
@ -233,17 +235,17 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Een gepubliceerde feature ophalen</h3> <h3>Getting a published feature</h3>
<p> <p>
Haal een door een andere ontwikkelaar gepubliceerde feature op. Get a feature published by another user.
</p> </p>
<blockquote> <blockquote>
git flow feature pull origin MYFEATURE git flow feature pull origin MYFEATURE
</blockquote> </blockquote>
<p>Je kan de wijzigingen op de feature bijhouden op de server door <code> git flow feature track MYFEATURE</code> uit te voeren</p> <p>You can track a feature on origin by using <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>
@ -252,30 +254,29 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="release" href="#release">Een release maken</a></h2> <h2><a name="release" href="#release">Make a release</a></h2>
<ul> <ul>
<li>Ondersteunt de voorbereiding op een nieuwe productie release</li> <li>Support preparation of a new production release</li>
<li>Staat kleine bugfixes toe en bereidt meta-data van een release voor</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>Een release starten</h3> <h3>Start a release</h3>
<p>Om een release te starten, kun je het git flow release commando gebruiken. Dit</p> <p>To start a release, use the git flow release command. It creates a release branch created from the 'develop' branch.</p>
maakt een release branch aan gebaseerd op de 'develop' branch.
</p>
<blockquote> <blockquote>
git flow release start RELEASE [BASE] git flow release start RELEASE [BASE]
</blockquote> </blockquote>
<p>Je kan optioneel een <code>[BASE]</code> commit sha-1 hash toevoegen om de release hiervandaan te beginnen. Deze commit moet op de <p>You can optionally supply a <code>[BASE]</code> commit sha-1 hash to start the release from. The commit must
'develop' branch aanwezig zijn.</p> be on the
'develop' branch.</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>Het is verstandig om de release branch te publiceren zodat andere ontwikkelaars hieraan kunnen meewerken. Dit lijkt op het publiceren van een feature branch:</p> <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>
<blockquote> <blockquote>
git flow release publish RELEASE git flow release publish RELEASE
</blockquote> </blockquote>
<p>(Je kan wijzigingen op de release branch bijhouden met het <br/><code>git flow release track RELEASE</code> commando)</p> <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>
@ -284,19 +285,19 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Een release afronden</h3> <h3>Finish up a release</h3>
<p>Een release afronden is een grote stap in git branchen. Het voert verschillende acties uit:</p> <p>Finishing a release is one of the big steps in git branching. It performs several actions:</p>
<ul> <ul>
<li>De release branch wordt terug in 'master' gemerged</li> <li>Merges the release branch back into 'master'</li>
<li>De release wordt getagged met zijn naam</li> <li>Tags the release with its name</li>
<li>De release wordt terug in 'develop' gemerged</li> <li>Back-merges the release into 'develop'</li>
<li>Verwijdert de release branch</li> <li>Removes the release branch</li>
</ul> </ul>
<blockquote> <blockquote>
git flow release finish RELEASE git flow release finish RELEASE
</blockquote> </blockquote>
<p>Vergeet niet je tags te pushen met <code>git push --tags</code></p> <p>Don't forget to push your tags with<code>git push --tags</code></p>
</div> </div>
<div class="col-2"> <div class="col-2">
@ -309,19 +310,19 @@
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2> <h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
<ul> <ul>
<li>Hotfixes ontstaan wanneer er onmiddellijk gehandeld moet worden na een bug in de live versie <li>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version
</li> </li>
<li>Kan de corresponderende tag op de 'master' branch als basis hebben.</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>Zoals andere git flow commando's, een hotfix wordt gestart door</p> <p>Like the other git flow commands, a hotfix is started with</p>
<blockquote> <blockquote>
git flow hotfix start VERSION [BASENAME] git flow hotfix start VERSION [BASENAME]
</blockquote> </blockquote>
<p>Het VERSION argument slaat op de nieuwe hotfix release naam. Optioneel kun je de BASENAME aangeven waarvandaan begonnen moet worden.</p> <p>The version argument hereby marks the new hotfix release name. 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>
@ -330,9 +331,9 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Een hotfix afronden</h3> <h3>Finish a hotfix</h3>
<p>Het afronden van een hotfix zorgt ervoor dat deze zowel in develop als in master gemerged wordt. Aansluitend wordt de merge in de master getagged met de hotfix versie.</p> <p>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version.</p>
<blockquote> <blockquote>
git flow hotfix finish VERSION git flow hotfix finish VERSION
</blockquote> </blockquote>
@ -352,7 +353,7 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="commands" href="#commands">Commando's</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>
@ -360,10 +361,12 @@
<h2>Backlog</h2> <h2>Backlog</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Niet alle beschikbare commando's zijn hier behandeld, alleen de belangrijkste</li> <li>Not all available commands are covered here, only the most important ones</li>
<li>Je kan git en al zijn commando's gewoon blijven gebruiken daar git flow alleen een handig gereedschap is</li> <li>You can still use git and all its commands normally as you know them, git flow is only a tooling
<li>De 'support' feature is nog steeds in beta, het gebruik hiervan wordt niet geadviseerd</li> collection
<li>Als je vertalingen wilt aanleveren, zal ik deze graag integreren</li> </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>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
@ -373,7 +376,7 @@
<footer> <footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Reacties</a></h2> <h2><a name="comments" href="#comments">Comments</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>

188
index.pt_BR.html
View File

@ -3,7 +3,7 @@
<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>git-flow cheatsheet</title>
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'> <link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print"> <link rel="stylesheet" href="css/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.css" type="text/css" media="screen,print">
@ -27,13 +27,13 @@
</script> </script>
</head> </head>
<body> <body>
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork no GitHub</a></div> <div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
<header> <header>
<h1 id="title">cheatsheet do git-flow</h1> <h1 id="title">git-flow cheatsheet</h1>
<p id="author"> <p id="author">
criado por <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 href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a>
<script>!function (d, s, id) { <script>!function (d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0]; var js, fjs = d.getElementsByTagName(s)[0];
@ -45,11 +45,12 @@
} }
}(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">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p>
<p id="translations">traduções: <p id="translations">translations:
<a href="index.html" title="Inglês">English</a> - <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="#" class="active" title="Português Brasileiro">Português Brasileiro</a> - <a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - <a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
<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> -
@ -67,38 +68,38 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="sobre" href="#sobre" >Sobre</a></h2> <h2>About</h2>
<p> <p>
O git-flow é um conjunto de extensões para o git que provê operações de alto-nível para git-flow are a set of git extensions to provide high-level repository operations for Vincent
repositórios usando o modelo de branches do Vincent Driessen. Driessen's branching model.
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">mais</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>Este cheatsheet demonstra o uso básico e o efeito das operações do git-flow</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><a name="dicas_basicas" href="#dicas_basicas" >Dicas básicas</a></h2> <h2>Basic tips</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>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li>
acontecendo...</li> <li>The OSX/Windows Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides
<li>O cliente do OSX <a href="http://www.sourcetreeapp.com/">Sourcetree</a> é um excelente gui para o git e git-flow support
tem suporte ao git-flow
</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="instalacao" href="#instalacao" >Instalação</a></h2> <h2><a name="setup" href="#setup">Setup</a></h2>
<ul> <ul>
<li>Você precisa do git instalado como pré-requisito.</li> <li>You need a working git installation as prerequisite.</li>
<li>O git flow funciona no OSX, Linux e no Windows</li> <li>Git flow works on OSX, Linux and 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">
@ -120,31 +121,31 @@
$ 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>You need wget and util-linux to install git-flow.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <p>
Para instruções detalhadas sobre a instalação, visite For detailed git flow intallation instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow
a <a href="https://github.com/nvie/gitflow/wiki/Windows">wiki wiki</a>.
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="getting_started" href="#getting_started">Getting started</a></h2>
<p>O git-flow precisa ser inicializado para personalizar a configuração de seu projeto.</p> <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>Inicialização</h3> <h3>Initialize</h3>
<p>Comece o uso do git-flow fazendo sua inicialização dentro de um repositório git existente:</p> <p>Start using git-flow by initializing it inside an existing git repository:</p>
<blockquote> <blockquote>
git flow init git flow init
</blockquote> </blockquote>
<p> <p>
Você precisa responder algumas questões relativas às convenções de nomenclatura dos seus branches.<br/> You'll have to answer a few questions regarding the naming conventions for your branches.<br/>
É recomendado que sejam usados os valores padrões. It's recommended to use the default values.
</p> </p>
</div> </div>
@ -158,22 +159,33 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="features" href="#features" >Funcionalidades/features</a></h2> <h2><a name="features" href="#features">Features</a></h2>
<ul class="narrow"> <ul class="narrow">
<li>Desenvolva novas funcionalidades para as versões futuras</li> <li>Develop new features for upcoming releases</li>
<li>Normalmente existem apenas nos repositórios dos desenvolvedores</li> <li>Typically exist in developers repos only</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>Start a new feature</h3>
<p>O desenvolvimento de novas funcionalidades começa no branch 'develop'.</p> <p>Development of new features starting from the 'develop' branch.</p>
<p>Comece o desenvolvimento de uma nova funcionalidade com</p> <p>Start developing a new feature with</p>
<blockquote> <blockquote>
git flow feature start MYFEATURE git flow feature start MYFEATURE
</blockquote> </blockquote>
<p>Esse comando cria um novo branch da funcionalidade baseado no 'develop' e alterna para ele</p> <p>This action creates a new feature branch based on 'develop' and switches to it</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>
<div class="col-2"> <div class="col-2">
<div class="feature-start"></div> <div class="feature-start"></div>
@ -182,16 +194,16 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finalizar uma funcionalidade</h3> <h3>Finish up a feature</h3>
<p> <p>
Finaliza o desenvolvimento de uma funcionalidade. Finish the development of a feature.
Esse comando faz o seguinte This action performs the following
</p> </p>
<ul> <ul>
<li>Mescla MYFEATURE no 'develop'</li> <li>Merged MYFEATURE into 'develop'</li>
<li>Remove o branch da funcionalidade</li> <li>Removes the feature branch</li>
<li>Volta para o branch 'develop'</li> <li>Switches back to 'develop' branch</li>
</ul> </ul>
<blockquote> <blockquote>
@ -205,12 +217,11 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Publicar uma funcionalidade</h3> <h3>Publish a feature</h3>
<p> <p>
Você está desenvolvendo uma funcionalidade colaborativamente? <br/> Are you developing a feature in collaboration? <br/>
Publique uma funcionalidade para o servidor remoto, assim ela pode ser Publish a feature to the remote server so it can be used by other users.
utilizada por outros usuários.
</p> </p>
<blockquote> <blockquote>
@ -224,16 +235,17 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Obter uma funcionalidade publicada</h3> <h3>Getting a published feature</h3>
<p> <p>
Obtenha uma funcionalidade publicada por outro usuário e acompanhe Get a feature published by another user.
as alterações remotas.
</p> </p>
<blockquote> <blockquote>
git flow feature pull MYFEATURE git flow feature pull origin MYFEATURE
</blockquote> </blockquote>
<p>You can track a feature on origin by using <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>
@ -242,31 +254,29 @@
<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">Make a release</a></h2>
<ul> <ul>
<li>Auxilia a preparação de uma nova versão de produção</li> <li>Support preparation of a new production release</li>
<li>Permite correções de bugs menores e a preparação de metadados de uma versão</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>Começar uma versão</h3> <h3>Start a release</h3>
<p>Para começar uma versão, use o comando git flow release. Ele<br/> <p>To start a release, use the git flow release command. It creates a release branch created from the 'develop' branch.</p>
cria um branch da versão baseado no branch 'develop'.
</p>
<blockquote> <blockquote>
git flow release start RELEASE [BASE] git flow release start RELEASE [BASE]
</blockquote> </blockquote>
<p>Você pode opcionalmente fornecer um hash sha-1 do commit <code>[BASE]</code> de onde começar a versão. O <p>You can optionally supply a <code>[BASE]</code> commit sha-1 hash to start the release from. The commit must
commit precisa estar no branch 'develop'</p> be on the
'develop' branch.</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>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>
desenvolvedores. É semelhante à publicação de uma funcionalidade com o comando:</p>
<blockquote> <blockquote>
git flow release publish RELEASE git flow release publish RELEASE
</blockquote> </blockquote>
<p>(Você pode acompanhar uma versão remota com o comando <br/><code>git flow release track RELEASE</code>)</p> <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>
@ -275,18 +285,20 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finalizar uma versão</h3> <h3>Finish up a release</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>Finishing a release is one of the big steps in git branching. It performs several actions:</p>
<ul> <ul>
<li>Mescla o branch da versão no 'master'</li> <li>Merges the release branch back into 'master'</li>
<li>Etiqueta a versão com seu nome</li> <li>Tags the release with its name</li>
<li>Mescla o branch da versão de volta no 'develop'</li> <li>Back-merges the release into 'develop'</li>
<li>Remove o branch da versão</li> <li>Removes the release branch</li>
</ul> </ul>
<blockquote> <blockquote>
git flow release finish RELEASE git flow release finish RELEASE
</blockquote> </blockquote>
<p>Don't forget to push your tags with<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>
@ -295,21 +307,22 @@
</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>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version
<li>Pode ser criado a partir da tag correspondente no branch master que indica a versão em produção.</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>Assim como os outros comandos do git flow, um hotfix inicia com</p> <p>Like the other git flow commands, a hotfix is started with</p>
<blockquote> <blockquote>
git flow hotfix start RELEASE git flow hotfix start VERSION [BASENAME]
</blockquote> </blockquote>
<p>O argumento release nesse caso marca a versão defeituosa na produção</p> <p>The version argument hereby marks the new hotfix release name. 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>
@ -318,11 +331,11 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finalizar um hotfix</h3> <h3>Finish a 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>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version.</p>
<blockquote> <blockquote>
git flow hotfix finish RELEASE git flow hotfix finish VERSION
</blockquote> </blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
@ -340,7 +353,7 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comandos" href="#comandos" >Comandos</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>
@ -348,11 +361,12 @@
<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>Not all available commands are covered here, only the most important ones</li>
<li>Você pode continuar a usar o git e todos os comandos dele normalmente como você já conhece, o git flow <li>You can still use git and all its commands normally as you know them, git flow is only a tooling
é apenas uma coleção de ferramentas</li> collection
<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>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>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
@ -362,7 +376,7 @@
<footer> <footer>
<div class="scrollblock"> <div class="scrollblock">
<h2>Comentários</h2> <h2><a name="comments" href="#comments">Comments</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>
@ -381,9 +395,9 @@
(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>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
</noscript> </noscript>
<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" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
</body> </body>

174
index.ru_RU.html
View File

@ -3,20 +3,11 @@
<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 cheatsheet</title>
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
<!-- Lobster is same as Sansita but with cyrillic and another subsets. I recomend to use Lobster instead Sansita everywere-->
<link href='http://fonts.googleapis.com/css?family=Lobster&subset=latin,cyrillic' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print"> <link rel="stylesheet" href="css/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.css" type="text/css" media="screen,print">
<style>
.title, h1, h2, h2 a, h3 {
font-family: 'Lobster';
}
</style>
<script src="js/jquery-1.7.2.min.js"></script> <script src="js/jquery-1.7.2.min.js"></script>
@ -39,10 +30,10 @@
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div> <div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
<header> <header>
<h1 id="title">Шпаргалка по git-flow</h1> <h1 id="title">git-flow cheatsheet</h1>
<p id="author"> <p id="author">
создал <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 href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a>
<script>!function (d, s, id) { <script>!function (d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0]; var js, fjs = d.getElementsByTagName(s)[0];
@ -54,18 +45,20 @@
} }
}(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">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p>
<p id="translations">переводы: <p id="translations">translations:
<a href="index.html" title="english">English</a> - <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">Brazilian Portugues</a> -
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - <a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
<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.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="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
<a href="index.de_DE.html" title="German">Deutsch (German)</a> - <a href="index.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>
</p> </p>
@ -75,37 +68,38 @@
<div class="scrollblock"> <div class="scrollblock">
<h2>Введение</h2> <h2>About</h2>
<p> <p>
git-flow — это набор расширений git предоставляющий высокоуровневые операции над репозиторием для поддержки модели ветвления Vincent git-flow are a set of git extensions to provide high-level repository operations for Vincent
Driessen. Driessen's branching model.
<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/">more</a></small>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>Эта шпаргалка показывает основные способы использования операций git-flow.</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>Общие замечания</h2> <h2>Basic tips</h2>
<ul> <ul>
<li>Git flow предоставляет превосходную командную строку со справкой и улучшенными выводом. Внимательно читайте его, чтобы знать, что происходит...</li> <li>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li>
<li>Клиент для OSX/Windows <a href="http://www.sourcetreeapp.com/">Sourcetree</a> — отличный GUI для Git — также поддерживает git-flow <li>The OSX/Windows Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides
git-flow support
</li> </li>
<li>Git-flow основан на слиянии. Для слияния веток фич не используется rebase.</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">Установка</a></h2> <h2><a name="setup" href="#setup">Setup</a></h2>
<ul> <ul>
<li>В первую очередь вам нужна рабочая установка git</li> <li>You need a working git installation as prerequisite.</li>
<li>Git flow работает на OSX, Linux и Windows</li> <li>Git flow works on OSX, Linux and 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">
@ -127,11 +121,11 @@
$ 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>Вам потребуется wget и util-linux для установки 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>
Подробные инструкции по установке git flow смотрите на <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow For detailed git flow intallation instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow
wiki</a>. wiki</a>.
</p> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow"/>
@ -139,19 +133,19 @@
</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">Getting started</a></h2>
<p>Git flow нужно инициализировать, чтобы настроить его для работы с вашим проектом.</p> <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>Инициализация</h3> <h3>Initialize</h3>
<p>Для начала использования git-flow проинициализируйте его внутри существующего git-репозитория:</p> <p>Start using git-flow by initializing it inside an existing git repository:</p>
<blockquote> <blockquote>
git flow init git flow init
</blockquote> </blockquote>
<p> <p>
Вам придётся ответить на несколько вопросов о способах именования ваших веток.<br/> You'll have to answer a few questions regarding the naming conventions for your branches.<br/>
Рекомендуется оставить значения по умолчанию. It's recommended to use the default values.
</p> </p>
</div> </div>
@ -165,22 +159,22 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="features" href="#features">Фичи</a></h2> <h2><a name="features" href="#features">Features</a></h2>
<ul class="narrow"> <ul class="narrow">
<li>Разработка новых фич для последующих релизов</li> <li>Develop new features for upcoming releases</li>
<li>Обычно присутствует только в репозиториях разработчиков</li> <li>Typically exist in developers repos only</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>Start a new feature</h3>
<p>Разработка новых фич начинается из ветки "develop".</p> <p>Development of new features starting from the 'develop' branch.</p>
<p>Для начала разработки фичи выполните:</p> <p>Start developing a new feature with</p>
<blockquote> <blockquote>
git flow feature start MYFEATURE git flow feature start MYFEATURE
</blockquote> </blockquote>
<p>Это действие создаёт новую ветку фичи, основанную на ветке "develop", и переключается на неё.</p> <p>This action creates a new feature branch based on 'develop' and switches to it</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -200,16 +194,16 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Завершение фичи</h3> <h3>Finish up a feature</h3>
<p> <p>
Окончание разработки фичи. Finish the development of a feature.
Это действие выполняется так: This action performs the following
</p> </p>
<ul> <ul>
<li>Слияние ветки MYFEATURE в "develop"</li> <li>Merged MYFEATURE into 'develop'</li>
<li>Удаление ветки фичи</li> <li>Removes the feature branch</li>
<li>Переключение обратно на ветку "develop"</li> <li>Switches back to 'develop' branch</li>
</ul> </ul>
<blockquote> <blockquote>
@ -223,11 +217,11 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Публикация фичи</h3> <h3>Publish a feature</h3>
<p> <p>
Вы разрабатываете фичу совместно с коллегами? <br/> Are you developing a feature in collaboration? <br/>
Опубликуйте фичу на удалённом сервере, чтобы её могли использовать другие пользователи. Publish a feature to the remote server so it can be used by other users.
</p> </p>
<blockquote> <blockquote>
@ -241,17 +235,17 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Получение опубликованной фичи</h3> <h3>Getting a published feature</h3>
<p> <p>
Получение фичи, опубликованной другим пользователем. Get a feature published by another user.
</p> </p>
<blockquote> <blockquote>
git flow feature pull origin MYFEATURE git flow feature pull origin MYFEATURE
</blockquote> </blockquote>
<p>Вы можете отслеживать фичу в репозитории origin с помощью команды <code> git flow feature track MYFEATURE</code></p> <p>You can track a feature on origin by using <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>
@ -260,31 +254,29 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="release" href="#release">Создание релиза</a></h2> <h2><a name="release" href="#release">Make a release</a></h2>
<ul> <ul>
<li>Поддержка подготовки нового релиза продукта</li> <li>Support preparation of a new production release</li>
<li>Позволяет устранять мелкие баги и подготавливать различные метаданные для релиза</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>Начало релиза</h3> <h3>Start a release</h3>
<p>Для начала работы над релизом используйте команду <code>git flow release</code> <p>To start a release, use the git flow release command. It creates a release branch created from the 'develop' branch.</p>
Она создаёт ветку релиза, ответляя от ветки "develop".
</p>
<blockquote> <blockquote>
git flow release start RELEASE [BASE] git flow release start RELEASE [BASE]
</blockquote> </blockquote>
<p>При желании вы можете указать <code>[BASE]</code>-коммит в виде его хеша sha-1, чтобы начать релиз с него. <p>You can optionally supply a <code>[BASE]</code> commit sha-1 hash to start the release from. The commit must
Этот коммит должен принадлежать ветке "develop".</p> be on the
'develop' branch.</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<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> <blockquote>
git flow release publish RELEASE git flow release publish RELEASE
</blockquote> </blockquote>
<p>Вы также можете отслеживать удалённый релиз с помощью команды <br/><code>git flow release track RELEASE</code></p> <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>
@ -293,19 +285,19 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Завершение релиза</h3> <h3>Finish up a release</h3>
<p>Завершение релиза — один из самых больших шагов в git-ветвлени. При этом происходит несколько действий:</p> <p>Finishing a release is one of the big steps in git branching. It performs several actions:</p>
<ul> <ul>
<li>Ветка релиза сливается в ветку "master"</li> <li>Merges the release branch back into 'master'</li>
<li>Релиз помечается тегом равным его имени</li> <li>Tags the release with its name</li>
<li>Ветка релиза сливается обратно в ветку "develop"</li> <li>Back-merges the release into 'develop'</li>
<li>Ветка релиза удаляется</li> <li>Removes the release branch</li>
</ul> </ul>
<blockquote> <blockquote>
git flow release finish RELEASE git flow release finish RELEASE
</blockquote> </blockquote>
<p>Не забудьте отправить изменения в тегах с помощью команды <code>git push --tags</code></p> <p>Don't forget to push your tags with<code>git push --tags</code></p>
</div> </div>
<div class="col-2"> <div class="col-2">
@ -315,22 +307,22 @@
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">Исправления</a></h2> <h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
<ul> <ul>
<li>Исправления нужны в том случае, когда нужно незамедлительно устранить нежелательное состояние продакшн-версии продукта</li> <li>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version
<li>Может ответвляться от соответствующего тега на ветке "master", который отмечает выпуск продакшн-версии</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>Как и в случае с другими командами git flow, работа над исправлением начинается так:</p> <p>Like the other git flow commands, a hotfix is started with</p>
<blockquote> <blockquote>
git flow hotfix start VERSION [BASENAME] git flow hotfix start VERSION [BASENAME]
</blockquote> </blockquote>
<p>Аргумент VERSION определяет имя нового, исправленного релиза.</p> <p>The version argument hereby marks the new hotfix release name. Optionally you can specify a basename to start from.</p>
<p>При желании можно указать BASENAME-коммит, от которого произойдёт ответвление.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
@ -339,10 +331,9 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Завершение исправления</h3> <h3>Finish a hotfix</h3>
<p>Когда исправление готово, оно сливается обратно в ветки "develop" и "master". <p>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version.</p>
Кроме того, коммит в ветке "master" помечается тегом с версией исправления.</p>
<blockquote> <blockquote>
git flow hotfix finish VERSION git flow hotfix finish VERSION
</blockquote> </blockquote>
@ -362,17 +353,20 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="commands" href="#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>Последние замечания</h2> <h2>Backlog</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Здесь описаны не все доступные команды, только наиболее важные</li> <li>Not all available commands are covered here, only the most important ones</li>
<li>Вы можете продолжать использовать git и все его команды, как обычно, git flow — это просто набор дополнительных инструментов</li> <li>You can still use git and all its commands normally as you know them, git flow is only a tooling
<li>Возможности "support"-веток пока в beta-версии, использовать их не рекомендуется</li> collection
</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>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
@ -382,7 +376,7 @@
<footer> <footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Комментарии</a></h2> <h2><a name="comments" href="#comments">Comments</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>

209
index.tr_TR.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="tr" 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">
@ -33,7 +33,7 @@
<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> 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 href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a>
<script>!function (d, s, id) { <script>!function (d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0]; var js, fjs = d.getElementsByTagName(s)[0];
@ -45,14 +45,15 @@
} }
}(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">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p>
<p id="translations">çeviriler: <p id="translations">translations:
<a href="index.html" title="english">English</a> - <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">Brazilian Portugues</a> -
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
<a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> - <a href="index.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
<a href="index.ja_JP.html" title="日本語">日本語</a> - <a href="index.ja_JP.html" title="日本語">日本語</a> -
<a href="#" class="active" 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.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
@ -67,42 +68,38 @@
<div class="scrollblock"> <div class="scrollblock">
<h2>Hakkında</h2> <h2>About</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 are a set of git extensions to provide high-level repository operations for Vincent
yapabilmenizi sağlayan, sözkonusu dallanma modelini kullanmayı oldukça kolaylaştıran git eklentilerini içerir. Driessen's branching model.
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/"><br>Vincent Driessen'in dallanma modeli hakkında</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>Bu döküman git flow işlemleri hakkında temel kullanım şekillerini içermektedir.</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>Temel Ipuçları</h2> <h2>Basic tips</h2>
<ul> <ul>
<li>Git flow komut satırları ile kusursuz yardım (help) ve çıktı (output) sağlar.</li> <li>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li>
<li>OSX ve Windows kullanıcıları için <a href="http://www.sourcetreeapp.com/">Sourcetree</a> , git flowa destek <li>The OSX/Windows Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides
veren mükemmel bir git gui aracıdır. git-flow support
</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 <li>Git-flow is a merge based solution. It doesn't rebase feature branches.</li>
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">Setup</a></h2>
<ul> <ul>
<li>Git flow'u kullanabilmek için öncelikli olarak git kurulumunun yapılması gerekmektedir.</li> <li>You need a working git installation as prerequisite.</li>
<li>Git flow OSX, Linux ve Windows üzerinde çalıştırılabilir.</li> <li>Git flow works on OSX, Linux and 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">
@ -124,12 +121,11 @@
$ 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>Git flow kurulumu için wget ve util-linux gerekmektedir.</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>
Git-flow kurulumu hakkında detaylı bilgi için git flow wiki'yi For detailed git flow intallation instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow
ziyaret edebilirsiniz.<a href="https://github.com/nvie/gitflow/wiki/Windows">git flow
wiki</a>. wiki</a>.
</p> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow"/>
@ -137,22 +133,19 @@
</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">Getting started</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 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>Başlangıç (Initialize)</h3> <h3>Initialize</h3>
<p>git flow'u kullanmak istediğiniz reponuzdayken; <p>Start using git-flow by initializing it inside an existing git repository:</p>
</p>
<blockquote> <blockquote>
git flow init git flow init
</blockquote> </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. You'll have to answer a few questions regarding the naming conventions for your branches.<br/>
Bu bağlamda varsayılan (default) değerleri kullanmanız önerilir. It's recommended to use the default values.
</p> </p>
</div> </div>
@ -166,26 +159,22 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="features" href="#features">Özellikler (Features)</a></h2> <h2><a name="features" href="#features">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>Develop new features for upcoming releases</li>
<li>Genel olarak sadece geliştirici repolarında bulunurlar.</li> <li>Typically exist in developers repos only</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>Start a new feature</h3>
<h3>(feature start)</h3> <p>Development of new features starting from the 'develop' branch.</p>
<p>Yeni özelliklerin eklenmesi öncelikle develop dalından (branch) başlar.</p> <p>Start developing a new feature with</p>
<p>Yeni bir özelliği kodlamaya </p>
<blockquote> <blockquote>
git flow feature start MYFEATURE git flow feature start MYFEATURE
</blockquote> </blockquote>
<p> <p>This action creates a new feature branch based on 'develop' and switches to it</p>
ile başlarız. Bu komut bize develop dalını (branch) temel alan bir özellik dalı (feature) oluşturur.
Ve bulunduğumuz dalı develop/MYFEATURE olarak değiştirir.
</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -205,23 +194,21 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Bir özellik eklemesi bitirilirken (feature finish)</h3> <h3>Finish up a feature</h3>
<p> <p>
Bir özelliğin eklenme işlemi bitirilirken şunları yapılır: Finish the development of a feature.
This action performs the following
</p> </p>
<ul> <ul>
<li>Kendi çalıştığımız özellik dalı (burada MYFEATURE) develop ana dalı ile birleştirilir.</li> <li>Merged MYFEATURE into 'develop'</li>
<li>Bu birleşmeden sonra kendi özellik dalımız (MYFEATURE) silinir.</li> <li>Removes the feature branch</li>
<li>Bulunduğumuz dal tekrar develop olarak değiştirilir.</li> <li>Switches back to 'develop' branch</li>
</ul> </ul>
<blockquote> <blockquote>
git flow feature finish MYFEATURE git flow feature finish MYFEATURE
</blockquote> </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>
@ -230,22 +217,16 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<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/> Are you developing a feature in collaboration? <br/>
O zaman geliştirdiğiniz özelliği bir uzak sunucuya gönderin, Publish a feature to the remote server so it can be used by other users.
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 git flow feature publish MYFEATURE
</blockquote> </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>
@ -254,19 +235,17 @@
<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>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: Get a feature published by another user.
</p> </p>
<blockquote> <blockquote>
git flow feature pull MYFEATURE git flow feature pull origin MYFEATURE
</blockquote> </blockquote>
<p>
size yardımcı olacaktır. <p>You can track a feature on origin by using <code> git flow feature track MYFEATURE</code> </p>
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
@ -275,38 +254,29 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="release" href="#release">Bir yayın çıkarırken (release)</a></h2> <h2><a name="release" href="#release">Make a release</a></h2>
<ul> <ul>
<li>Yeni bir ürünün yayınlanmasına yardımcı olur.</li> <li>Support preparation of a new production release</li>
<li>Küçük hata giderimleri ve meta-data hazırlığı için kullanılabilir.</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>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>To start a release, use the git flow release command. It creates a release branch created from the 'develop' branch.</p>
<blockquote> <blockquote>
git flow release start RELEASE [BASE] git flow release start RELEASE [BASE]
</blockquote> </blockquote>
<p> <p>You can optionally supply a <code>[BASE]</code> commit sha-1 hash to start the release from. The commit must
komutu kullanılır.Bu komut ile develop dalını temel kabul eden bir release dalı (branch) yaratılır. be on the
</p> 'develop' branch.</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>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>
commitlerinin de kabul edilmesini sağlayabilirsiniz. Bunu özellik yayınlama (feature publishing) ile kolaylıkla yapabilirsiniz.
</p>
<blockquote> <blockquote>
git flow release publish RELEASE git flow release publish RELEASE
</blockquote> </blockquote>
<p>(Uzak sunucu üzerindeki yayınları <br/> <p>(You can track a remote release with the <br/><code>git flow release track RELEASE</code> command)</p>
<code>git flow release track RELEASE</code>
<br>ile izleyebilirsiniz. )</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
@ -315,25 +285,20 @@
<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>Finish up a release</h3>
<h3>(Finish up a release)</h3>
<p> <p>Finishing a release is one of the big steps in git branching. It performs several actions:</p>
Bir sürüm yayınını tamamlarken git dallanmasının (branching) en büyük adımını atarız. Yayınlanma tamamlanırken:
</p>
<ul> <ul>
<li>Yayınlama yaptığımız dal olan release dalı (branch) master ana dalı ile birleştirilir.</li> <li>Merges the release branch back into 'master'</li>
<li>Etiketler (tags) isimleri ile birlikte yayınlanır.</li> <li>Tags the release with its name</li>
<li>Arkaplandaki birleştirmeler (back-merges) develop dalında yayınlanır.</li> <li>Back-merges the release into 'develop'</li>
<li>Yayınlama için açmış olduğumuz dal (branch) silinir.</li> <li>Removes the release branch</li>
</ul> </ul>
<blockquote> <blockquote>
git flow release finish RELEASE git flow release finish RELEASE
</blockquote> </blockquote>
<p> <p>Don't forget to push your tags with<code>git push --tags</code></p>
sizler için bu işlemleri halledecektir. Ancak etiketlerinizi de eklemeyi unutmayın!
<code>git push --tags</code> bu sorununuzu da halledecektir.
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-end"></div> <div class="release-end"></div>
@ -342,27 +307,22 @@
</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">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>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version
</li> </li>
<li>Hotfixler, master ana dalı (branch)ındaki versiyon numarasını belirten etiketten dallanır (branching).</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>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> <p>Like the other git flow commands, a hotfix is started with</p>
<blockquote> <blockquote>
git flow hotfix start VERSION [BASENAME] git flow hotfix start VERSION [BASENAME]
</blockquote> </blockquote>
<p> <p>The version argument hereby marks the new hotfix release name. Optionally you can specify a basename to start from.</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>
@ -371,11 +331,9 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<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>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version.</p>
Ayrıca master dalına (branch) hotfix versiyonunun etiketi eklenir.</p>
<blockquote> <blockquote>
git flow hotfix finish VERSION git flow hotfix finish VERSION
</blockquote> </blockquote>
@ -395,21 +353,20 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="commands" href="#commands">Komutlar (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>Içerik bilgisi (Backlog)</h2> <h2>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>Not all available commands are covered here, only the most important ones</li>
Ancak tüm Git flow komutları burda bahsedilenlerle sınırlı değildir.</li> <li>You can still use git and all its commands normally as you know them, git flow is only a tooling
<li>Git flow kullanırken git ve gite ait diğer alt komutları gönlünüzce kullanabilirsiniz. collection
Git flow sadece bir repo derleme-toplama aracıdır.
</li> </li>
<li>Support branch hala beta sürümündedir.Kullanımı tavsiye edilmemektedir.</li> <li>The 'support' feature is still beta, using it is not advised</li>
<li>Çevirilerinizle bize destek olabilirsiniz.Bunları projemize eklemekten mutluluk duyarız.</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>
@ -419,7 +376,7 @@
<footer> <footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Yorumlar (Comments)</a></h2> <h2><a name="comments" href="#comments">Comments</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>

187
index.zh_CN.html
View File

@ -1,14 +1,16 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh-CN" 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 cheatsheet</title>
<link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'> <link href='http://fonts.googleapis.com/css?family=Sansita+One' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="css/normalize.css" type="text/css" media="screen,print"> <link rel="stylesheet" href="css/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.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']);
@ -28,18 +30,28 @@
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div> <div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
<header> <header>
<h1 id="title" style="font-size: 80px;">git-flow 备忘清单</h1> <h1 id="title">git-flow cheatsheet</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> 创建 created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a>
<script>!function (d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (!d.getElementById(id)) {
js = d.createElement(s);
js.id = id;
js.src = "//platform.twitter.com/widgets.js";
fjs.parentNode.insertBefore(js, fjs);
}
}(document, "script", "twitter-wjs");</script>
</p> </p>
<p id="desc">使用 git-flow 进行有效的分支实践。 by <a href="http://nvie.com/" target="_blank">Vincent Driessen</a></p> <p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p>
<p id="translations">翻译: <p id="translations">translations:
<a href="index.html" title="english">English</a> - <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">Brazilian Portugues</a> -
<a href="#" class="active" title="Simplified Chinese">简体中文(Simplified Chinese)</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.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> -
@ -56,35 +68,38 @@
<div class="scrollblock"> <div class="scrollblock">
<h2>关于</h2> <h2>About</h2>
<p> <p>
git-flow 是一个 git 扩展集，按 Vincent Driessen 的分支模型提供高层次的库操作。 git-flow are a set of git extensions to provide high-level repository operations for Vincent
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">查看详情</a></small> Driessen's branching model.
<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>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>基础建议</h2> <h2>Basic tips</h2>
<ul> <ul>
<li>Git flow 提供了极出色的命令帮忙以及输出提示。请仔细阅读并观察发生了什么事情...</li> <li>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li>
<li>OSX 程序 <a href="http://www.sourcetreeapp.com/">Sourcetree</a> 是一个极出色的 git 界面客户端，已经提供了 git-flow 的支持。 </li> <li>The OSX/Windows Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides
<li>- Git-flow 是一个基于归并的解决方案，它并没有提供重置(rebase)特性分支的能力。</li> git-flow support
</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">安装</a></h2> <h2><a name="setup" href="#setup">Setup</a></h2>
<ul> <ul>
<li>你需要有一个可以工作的 git 作为前提。 </li> <li>You need a working git installation as prerequisite.</li>
<li>Git flow 可以工作在 OSX, Linux 和 Windows之下</li> <li>Git flow works on OSX, Linux and 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">
@ -106,29 +121,31 @@
$ 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>安装 git-flow, 你需要 wget 和 util-linux。</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>
更多的 git flow 安装指引，请阅读 <a href="https://github.com/nvie/gitflow/wiki/Windows" target="_blank">git flow wiki</a>. For detailed git flow intallation instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">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">Getting started</a></h2>
<p>为了自定义你的项目，Git flow 需要初始化过程。</p> <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>初始化</h3> <h3>Initialize</h3>
<p>使用 git-flow，从初始化一个现有的 git 库内开始:</p> <p>Start using git-flow by initializing it inside an existing git repository:</p>
<blockquote> <blockquote>
git flow init git flow init
</blockquote> </blockquote>
<p> <p>
你必须回答几个关于分支的命名约定的问题。<br/>建议使用默认值。 You'll have to answer a few questions regarding the naming conventions for your branches.<br/>
It's recommended to use the default values.
</p> </p>
</div> </div>
@ -142,22 +159,33 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="features" href="#features">特性</a></h2> <h2><a name="features" href="#features">Features</a></h2>
<ul class="narrow"> <ul class="narrow">
<li>为即将发布的版本开发新功能特性。</li> <li>Develop new features for upcoming releases</li>
<li>这通常只存在开发者的库中。</li> <li>Typically exist in developers repos only</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>Start a new feature</h3>
<p>新特性的开发是基于 'develop' 分支的。</p> <p>Development of new features starting from the 'develop' branch.</p>
<p>通过下面的命令开始开发新特性：</p> <p>Start developing a new feature with</p>
<blockquote> <blockquote>
git flow feature start MYFEATURE git flow feature start MYFEATURE
</blockquote> </blockquote>
<p>这个操作创建了一个基于'develop'的特性分支，并切换到这个分支之下。</p> <p>This action creates a new feature branch based on 'develop' and switches to it</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>
<div class="col-2"> <div class="col-2">
<div class="feature-start"></div> <div class="feature-start"></div>
@ -166,14 +194,16 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>完成新特性</h3> <h3>Finish up a feature</h3>
<p>完成开发新特性。这个动作执行下面的操作. <p>
Finish the development of a feature.
This action performs the following
</p> </p>
<ul> <ul>
<li>合并 MYFEATURE 分支到 'develop'</li> <li>Merged MYFEATURE into 'develop'</li>
<li>删除这个新特性分支</li> <li>Removes the feature branch</li>
<li>切换回 'develop' 分支</li> <li>Switches back to 'develop' branch</li>
</ul> </ul>
<blockquote> <blockquote>
@ -187,11 +217,11 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>发布新特性</h3> <h3>Publish a feature</h3>
<p> <p>
你是否合作开发一项新特性？<br/> Are you developing a feature in collaboration? <br/>
发布新特性分支到远程服务器，所以，其它用户也可以使用这分支。 Publish a feature to the remote server so it can be used by other users.
</p> </p>
<blockquote> <blockquote>
@ -205,15 +235,17 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>取得一个发布的新特性分支</h3> <h3>Getting a published feature</h3>
<p> <p>
取得其它用户发布的新特性分支，并签出远程的变更。 Get a feature published by another user.
</p> </p>
<blockquote> <blockquote>
git flow feature pull MYFEATURE git flow feature pull origin MYFEATURE
</blockquote> </blockquote>
<p>You can track a feature on origin by using <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>
@ -222,29 +254,29 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="release" href="#release">作一个release版本</a></h2> <h2><a name="release" href="#release">Make a release</a></h2>
<ul> <ul>
<li>支持一个新的用于生产环境的发布版本。 </li> <li>Support preparation of a new production release</li>
<li>允许修正小问题，并为发布版本准备元数据。 </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>开始准备release版本</h3> <h3>Start a release</h3>
<p>开始准备release版本，使用 git flow release 命令. </p> <p>To start a release, use the git flow release command. It creates a release branch created from the 'develop' branch.</p>
它从 'develop' 分支开始创建一个 release 分支。
</p>
<blockquote> <blockquote>
git flow release start RELEASE [BASE] git flow release start RELEASE [BASE]
</blockquote> </blockquote>
<p> 你可以选择提供一个 <code>[BASE]</code>参数，即提交记录的 sha-1 hash 值，来开启动 release 分支. 这个提交记录的 sha-1 hash 值必须是'develop' 分支下的。</p> <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>创建 release 分支之后立即发布允许其它用户向这个 release 分支提交见容是个明智的做法。命令十分类似发布新特性：</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>
<blockquote> <blockquote>
git flow release publish RELEASE git flow release publish RELEASE
</blockquote> </blockquote>
<p>(你可以通过 <br/><code>git flow release track RELEASE</code> 命令签出 release 版本的远程变更)</p> <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>
@ -253,18 +285,20 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>完成 release 版本</h3> <h3>Finish up a release</h3>
<p>完成 release 版本是一个大 git 分支操作。它执行下面几个动作： </p> <p>Finishing a release is one of the big steps in git branching. It performs several actions:</p>
<ul> <ul>
<li>归并 release 分支到 'master' 分支</li> <li>Merges the release branch back into 'master'</li>
<li>用 release 分支名打 Tag</li> <li>Tags the release with its name</li>
<li>归并 release 分支到 'develop'</li> <li>Back-merges the release into 'develop'</li>
<li>移除 release 分支</li> <li>Removes the release branch</li>
</ul> </ul>
<blockquote> <blockquote>
git flow release finish RELEASE git flow release finish RELEASE
</blockquote> </blockquote>
<p>Don't forget to push your tags with<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>
@ -273,21 +307,22 @@
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">热点修复</a></h2> <h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
<ul> <ul>
<li>热点修复来自这样的需求：生产环境的版本处于一个不预期状态，需要立即修正。 </li> <li>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version
<li> 有可能是需要修正 master 分支上某个 TAG 标记的生产版本。 </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 热点修复</h3> <h3>git flow hotfix start</h3>
<p>像其它 git flow 命令一样, 热点修复分支开始自：</p> <p>Like the other git flow commands, a hotfix is started with</p>
<blockquote> <blockquote>
git flow hotfix start VERSION [BASENAME] git flow hotfix start VERSION [BASENAME]
</blockquote> </blockquote>
<p> VERSION 参数标记着修正版本。你可以从 [BASENAME]开始，<code>[BASENAME]</code>为finish release时填写的版本号</p> <p>The version argument hereby marks the new hotfix release name. 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>
@ -296,9 +331,9 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>完成热点修复</h3> <h3>Finish a hotfix</h3>
<p>当完成热点分支，代码归并回 develop 和 master 分支。相应地，master 分支打上修正版本的 TAG。</p> <p>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version.</p>
<blockquote> <blockquote>
git flow hotfix finish VERSION git flow hotfix finish VERSION
</blockquote> </blockquote>
@ -318,7 +353,7 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="commands" href="#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>
@ -326,10 +361,12 @@
<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>Not all available commands are covered here, only the most important ones</li>
<li>你依旧可以继续使用你所知道和了解的 git 命令， git flow 只是一个工具集合。</li> <li>You can still use git and all its commands normally as you know them, git flow is only a tooling
<li>'support' 功能只是测试版本, 不建议使用</li> collection
<li>如果你乐意提供翻译，我很乐意整合它。</li> </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>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
@ -344,6 +381,7 @@
<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
@ -361,5 +399,6 @@
</noscript> </noscript>
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a> <a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
</body> </body>
</html> </html>

2
index.zh_TW.html
View File

@ -41,7 +41,7 @@
<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">Brazilian Portugues</a> -
<a href="#" class="active" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - <a href="#" class="active" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
<a href="index.zh_CN" title="Simplified Chinese">简体中文(Simplified Chinese)</a><br /> <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> -