extern/git-flow-cheatsheet
1
0
Fork 0
mirror of https://github.com/danielkummer/git-flow-cheatsheet.git synced 2025-05-20 16:10:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35 from RVLeLutin/fix-translate-ZN

Browse Source 
Revert index.fr_FR.thml to the true french translation
This commit is contained in:
Daniel Kummer 2015-01-30 15:51:35 +01:00
commit 4281a7ef6e
11 changed files with 916 additions and 888 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

171
index.ca_CA.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns="http://www.w3.org/1999/html"> <html lang="ca" xmlns="http://www.w3.org/1999/html">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@ -7,6 +7,7 @@
<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>
@ -33,7 +34,7 @@
<h1 id="title">git-flow cheatsheet</h1> <h1 id="title">git-flow cheatsheet</h1>
<p id="author"> <p id="author">
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> creat per <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a> <a 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,9 +46,9 @@
} }
}(document, "script", "twitter-wjs");</script> }(document, "script", "twitter-wjs");</script>
</p> </p>
<p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p> <p id="desc">branques eficients usant git-flow, per <a href="http://nvie.com/">Vincent Driessen</a></p>
<p id="translations">translations: <p id="translations">traduccions:
<a href="#" class="active" title="english">English</a> - <a href="index.html" class="active" title="english">English</a> -
<a href="index.es_ES.html" title="spanish">Castellano</a> - <a href="index.es_ES.html" title="spanish">Castellano</a> -
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> - <a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - <a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
@ -60,7 +61,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="index.ca_CA.html" title="Català">Català (Catalan)</a> <a href="#" title="Català">Català (Catalan)</a>
</p> </p>
</header> </header>
@ -68,38 +69,36 @@
<div class="scrollblock"> <div class="scrollblock">
<h2>About</h2> <h2>Sobre git-flow</h2>
<p> <p>
git-flow are a set of git extensions to provide high-level repository operations for Vincent git-flow és un conjunt d'extensions de git que proporcionen operacions d'alt nivell sobre repositoris pel model de branques de Vincent Driessen.
Driessen's branching model. <small><a href="http://nvie.com/posts/a-successful-git-branching-model/">més</a></small>
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">more</a></small>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>This cheatsheet shows the basic usage and effect of git-flow operations</p> <p>Aquest full de referència ràpida mostra l'ús bàsic i l'efecte de les operacions de git-flow</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Basic tips</h2> <h2>Consells bàsics</h2>
<ul> <ul>
<li>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li> <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>The OSX/Windows Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides <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
git-flow support
</li> </li>
<li>Git-flow is a merge based solution. It doesn't rebase feature branches.</li> <li>Git-flow és una solució basada en merge. No fa rebase de branques de funcionalitat (feature branches).</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="setup" href="#setup">Setup</a></h2> <h2><a name="setup" href="#setup">Instal·lació</a></h2>
<ul> <ul>
<li>You need a working git installation as prerequisite.</li> <li>Necessites una instal·lació de git funcionant com a prerrequisit.</li>
<li>Git flow works on OSX, Linux and Windows</li> <li>Git flow funciona a OSX, Linux i Windows</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
@ -121,31 +120,30 @@
$ 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> <p>Necessites wget i util-linux per instal·lar git-flow.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <p>
For detailed git flow intallation instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow Per instruccions detallades per instal·lar git flow, visita la <a href="https://github.com/nvie/gitflow/wiki/Windows">wiki de 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">Getting started</a></h2> <h2><a name="getting_started" href="#getting_started">Començant</a></h2>
<p>Git flow needs to be initialized in order to customize your project setup.</p> <p>Git flow necessita inicialitzar-se per personalitzar la configuració del teu projecte.</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Initialize</h3> <h3>Inicialitzar</h3>
<p>Start using git-flow by initializing it inside an existing git repository:</p> <p>Comença a usar git-flow inicialitzant-lo en un repositori git existent:</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/> Hauràs de contestar unes preguntes respecte les convencions per anomenar les branques.<br/>
It's recommended to use the default values. Es recomana usar els valors per defecte.
</p> </p>
</div> </div>
@ -159,22 +157,22 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="features" href="#features">Features</a></h2> <h2><a name="features" href="#features">Funcionalitats (features)</a></h2>
<ul class="narrow"> <ul class="narrow">
<li>Develop new features for upcoming releases</li> <li>Desenvolupa noves funcionalitats per les properes entregues (releases)</li>
<li>Typically exist in developers repos only</li> <li>Normalment només existeixen en els repositoris dels desenvolupadors</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Start a new feature</h3> <h3>Comença una nova funcionalitat</h3>
<p>Development of new features starting from the 'develop' branch.</p> <p>El desenvolupament de noves funcionalitats comença des de la branca 'develop'.</p>
<p>Start developing a new feature with</p> <p>Comença a desenvolupar una nova funcionalitat amb</p>
<blockquote> <blockquote>
git flow feature start MYFEATURE git flow feature start LAMEVAFUNCIONALITAT
</blockquote> </blockquote>
<p>This action creates a new feature branch based on 'develop' and switches to it</p> <p>Aquesta acció crea una nova branca de funcionalitat basada en 'develop' i la fa activa</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -194,20 +192,20 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish up a feature</h3> <h3>Acaba una funcionalitat</h3>
<p> <p>
Finish the development of a feature. Acaba el desenvolupament d'una funcionalitat.
This action performs the following Aquesta acció realitza el següent:
</p> </p>
<ul> <ul>
<li>Merged MYFEATURE into 'develop'</li> <li>Integra LAMEVAFUNCIONALITAT a 'develop'</li>
<li>Removes the feature branch</li> <li>Esborra la branca de funcionalitat</li>
<li>Switches back to 'develop' branch</li> <li>Torna a fer activa la branca 'develop'</li>
</ul> </ul>
<blockquote> <blockquote>
git flow feature finish MYFEATURE git flow feature finish LAMEVAFUNCIONALITAT
</blockquote> </blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
@ -217,15 +215,15 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Publish a feature</h3> <h3>Publica una funcionalitat</h3>
<p> <p>
Are you developing a feature in collaboration? <br/> Estàs desenvolupant una funcionalitat en col·laboració amb altres desenvolupadors? <br/>
Publish a feature to the remote server so it can be used by other users. Publica una funcionalitat al servidor remot de manera que hi puguin accedir altres usuaris.
</p> </p>
<blockquote> <blockquote>
git flow feature publish MYFEATURE git flow feature publish LAMEVAFUNCIONALITAT
</blockquote> </blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
@ -235,17 +233,17 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Getting a published feature</h3> <h3>Obtenint una funcionlitat publicada</h3>
<p> <p>
Get a feature published by another user. Obté una funcionalitat publicada per un altre usuari.
</p> </p>
<blockquote> <blockquote>
git flow feature pull origin MYFEATURE git flow feature pull origin LAMEVAFUNCIONALITAT
</blockquote> </blockquote>
<p>You can track a feature on origin by using <code> git flow feature track MYFEATURE</code> </p> <p>Pots seguir una funcionalitat a l'origen usant <code> git flow feature track LAMEVAFUNCIONALITAT</code> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
@ -254,29 +252,27 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="release" href="#release">Make a release</a></h2> <h2><a name="release" href="#release">Fes una entrega (release)</a></h2>
<ul> <ul>
<li>Support preparation of a new production release</li> <li>Prepara una nova entrega a producció</li>
<li>Allow for minor bug fixes and preparing meta-data for a release</li> <li>Permet arreglar petits errors i preparar les meta-dades per l'entrega</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Start a release</h3> <h3>Comença una entrega</h3>
<p>To start a release, use the git flow release command. It creates a release branch created from the 'develop' branch.</p> <p>Per començar una entrega, usa la comanda git flow release. Crea una branca d'entrega des de la branca 'develop'.</p>
<blockquote> <blockquote>
git flow release start RELEASE [BASE] git flow release start ENTREGA [BASE]
</blockquote> </blockquote>
<p>You can optionally supply a <code>[BASE]</code> commit sha-1 hash to start the release from. The commit must <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>
be on the
'develop' branch.</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>It's wise to publish the release branch after creating it to allow release commits by other developers. Do it similar to feature publishing with the command:</p> <p>És aconsellable publicar la branca d'entrega després de crear-la per tal que altres desenvolupadors puguin començar a fer-hi commits. Tal com per publicar funcionalitats, amb la comanda:</p>
<blockquote> <blockquote>
git flow release publish RELEASE git flow release publish ENTREGA
</blockquote> </blockquote>
<p>(You can track a remote release with the <br/><code>git flow release track RELEASE</code> command)</p> <p>Pots seguir una entrega en remot amb la comanda <br/><code>git flow release track ENTREGA</code></p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
@ -285,19 +281,19 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish up a release</h3> <h3>Acaba una entrega</h3>
<p>Finishing a release is one of the big steps in git branching. It performs several actions:</p> <p>Acabar una entrega és un dels grans passos en la gestió de branques amb git. Realitza les següents accions:</p>
<ul> <ul>
<li>Merges the release branch back into 'master'</li> <li>Integra la branca d'entrega a 'master'</li>
<li>Tags the release with its name</li> <li>Etiqueta l'entrega amb el seu nom</li>
<li>Back-merges the release into 'develop'</li> <li>Reintegra l'entrega a 'develop'</li>
<li>Removes the release branch</li> <li>Esborra la branca d'entrega</li>
</ul> </ul>
<blockquote> <blockquote>
git flow release finish RELEASE git flow release finish ENTREGA
</blockquote> </blockquote>
<p>Don't forget to push your tags with<code>git push --tags</code></p> <p>No oblidis pujar les etiquetes amb <code>git push --tags</code></p>
</div> </div>
<div class="col-2"> <div class="col-2">
@ -307,22 +303,22 @@
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2> <h2><a name="hotfixes" href="#hotfixes">Errors a producció (hotfixes)</a></h2>
<ul> <ul>
<li>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version <li>A vegades cal actuar inmediatament davant un estat no desitjat de la versió de producció i fer un hotfix
</li> </li>
<li>May be branched off from the corresponding tag on the master branch that marks the production version.</li> <li>Es pot crear una branca des de l'etiqueta corresponent a la branca 'master' que marqui la versió a producció.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>git flow hotfix start</h3> <h3>git flow hotfix start</h3>
<p>Like the other git flow commands, a hotfix is started with</p> <p>Com les altres comandes de git flow, un hotfix s'inicia amb</p>
<blockquote> <blockquote>
git flow hotfix start VERSION [BASENAME] git flow hotfix start VERSIÓ [NOMBASE]
</blockquote> </blockquote>
<p>The version argument hereby marks the new hotfix release name. Optionally you can specify a basename to start from.</p> <p>El paràmetre de la versió marca el nom de la nova entrega. Opcionalment pots especificar un nom base a partir del qual començar.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
@ -331,11 +327,11 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish a hotfix</h3> <h3>Acaba un hotfix</h3>
<p>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version.</p> <p>En acabar un hotfix, els canvis s'integren tant a 'develop' com a 'master'. Addicionalment, la integració a 'master' s'etiqueta amb la versió del hotfix.</p>
<blockquote> <blockquote>
git flow hotfix finish VERSION git flow hotfix finish VERSIÓ
</blockquote> </blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
@ -353,20 +349,19 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="commands" href="#commands">Commands</a></h2> <h2><a name="commands" href="#commands">Comandes</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands"/>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Backlog</h2> <h2>Tasques pendents</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Not all available commands are covered here, only the most important ones</li> <li>No totes les comandes disponibles s'han explicat, només les més importants</li>
<li>You can still use git and all its commands normally as you know them, git flow is only a tooling <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
collection
</li> </li>
<li>The 'support' feature is still beta, using it is not advised</li> <li>La funcionalitat 'support' encara està en fase beta, no s'aconsella usar-la</li>
<li>If you'd like to supply translations I'd be happy to integrate them</li> <li>Si vols ajudar en la traducció, <a href="https://github.com/danielkummer/git-flow-cheatsheet">endavant!</a></li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
@ -376,7 +371,7 @@
<footer> <footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Comments</a></h2> <h2><a name="comments" href="#comments">Comentaris</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>

191
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 cheatsheet</h1> <h1 id="title">git-flow Spickzettel</h1>
<p id="author"> <p id="author">
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> erstellt von <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a> <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,10 +45,10 @@
} }
}(document, "script", "twitter-wjs");</script> }(document, "script", "twitter-wjs");</script>
</p> </p>
<p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p> <p id="desc">Effizientes Branching mittels git-flow von <a href="http://nvie.com/">Vincent Driessen</a></p>
<p id="translations">translations: <p id="translations">Übersetzungen:
<a href="#" class="active" title="english">English</a> - <a href="index.html" title="English">English</a> -
<a href="index.es_ES.html" title="spanish">Castellano</a> - <a href="index.es_ES.html" title="Spanish">Castellano</a> -
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> - <a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional 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.zh_CN.html" title="Simplified Chinese">简体中文(Simplified Chinese)</a> -
@ -59,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="index.de_DE.html" title="German">Deutsch (German)</a> - <a href="#" class="active" title="German">Deutsch (German)</a> -
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> <a href="index.ca_CA.html" title="Català">Català (Catalan)</a>
</p> </p>
</header> </header>
@ -68,38 +68,36 @@
<div class="scrollblock"> <div class="scrollblock">
<h2>About</h2> <h2>Über</h2>
<p> <p>
git-flow are a set of git extensions to provide high-level repository operations for Vincent git-flow ist ein Set aus Git-Erweiterungen, welches komplexe Repository-Arbeiten
Driessen's branching model. nach Vincent Driessen's Branching-Modell ermöglicht.
<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/">mehr</a></small>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>This cheatsheet shows the basic usage and effect of git-flow operations</p> <p>Dieser Spickzettel veranschaulicht die grundlegende Nutzung und den Ablauf von git-flow Operationen.</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Basic tips</h2> <h2>Grundlegende Tipps</h2>
<ul> <ul>
<li>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li> <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>The OSX/Windows Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides <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>
git-flow support <li>git-flow ist eine rein Merge-basierte Lösung (Zusammenführung). Es findet kein Rebasing der Feature-Branches (Entwicklungszweige) statt.</li>
</li>
<li>Git-flow is a merge based solution. It doesn't rebase feature branches.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="setup" href="#setup">Setup</a></h2> <h2><a name="setup" href="#setup">Einrichtung</a></h2>
<ul> <ul>
<li>You need a working git installation as prerequisite.</li> <li>Du benötigst eine funktionierende Git Installation als Voraussetzung.</li>
<li>Git flow works on OSX, Linux and Windows</li> <li>git-flow läuft unter OSX, Linux und Windows.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
@ -121,11 +119,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>You need wget and util-linux to install git-flow.</p> <p>Du benötigst wget und util-linux um git-flow zu installieren.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <p>
For detailed git flow intallation instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow Für eine detaillierte git-flow Installationsanleitung, besuche bitte das <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"/>
@ -133,19 +131,19 @@
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">Getting started</a></h2> <h2><a name="getting_started" href="#getting_started">Erste Schritte</a></h2>
<p>Git flow needs to be initialized in order to customize your project setup.</p> <p>git-flow muss initalisiert werden, um das Projektsetup anzupassen.</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Initialize</h3> <h3>Initialisierung</h3>
<p>Start using git-flow by initializing it inside an existing git repository:</p> <p>Fange an mit git-flow zu arbeiten, indem Du es innerhalb eines bestehenden Git-Repository initialisierst:</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/> Dabei musst Du einige Fragen bezueglich der Namenskoventionen Deiner Branches (Entwicklungszweige) beantworten.<br/>
It's recommended to use the default values. Es wird empfohlen, die Standardwerte zu verwenden.
</p> </p>
</div> </div>
@ -162,19 +160,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>Develop new features for upcoming releases</li> <li>Entwicklung neuer Features für bevorstehende Releases.</li>
<li>Typically exist in developers repos only</li> <li>In der Regel nur in Entwickler-Repositories zu finden.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Start a new feature</h3> <h3>Entwicklung neuer Features</h3>
<p>Development of new features starting from the 'develop' branch.</p> <p>Neue Features werden vom 'develop'-Branch abgeleitet.</p>
<p>Start developing a new feature with</p> <p>Starte die Entwicklung eines neuen Features mittels</p>
<blockquote> <blockquote>
git flow feature start MYFEATURE git flow feature start MYFEATURE
</blockquote> </blockquote>
<p>This action creates a new feature branch based on 'develop' and switches to it</p> <p>Dieser Befehl erstellt einen neuen Feature-Branch basierend auf 'develop' und wechselt in diesen.</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -194,16 +192,16 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish up a feature</h3> <h3>Fertigstellung eines Features</h3>
<p> <p>
Finish the development of a feature. Beende die Entwicklung eines Features.
This action performs the following Dies führt zu folgenden Aktionen:
</p> </p>
<ul> <ul>
<li>Merged MYFEATURE into 'develop'</li> <li>Zusammenführen von MYFEATURE in den 'develop'-Branch (Merge-Prozess)</li>
<li>Removes the feature branch</li> <li>Entfernt den Feature-Branch</li>
<li>Switches back to 'develop' branch</li> <li>Wechselt zurück in den 'develop'-Branch</li>
</ul> </ul>
<blockquote> <blockquote>
@ -217,11 +215,12 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Publish a feature</h3> <h3>Veröffentlichen eines Features</h3>
<p> <p>
Are you developing a feature in collaboration? <br/> Entwickelst Du ein Feature in Zusammenarbeit? <br/>
Publish a feature to the remote server so it can be used by other users. Veröffentliche Dein Feature auf einem entfernten Server,
so dass es auch von anderen verfolgt werden kann.
</p> </p>
<blockquote> <blockquote>
@ -235,17 +234,23 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Getting a published feature</h3> <h3>Holen eines veröffentlichten Features</h3>
<p> <p>
Get a feature published by another user. Hole ein Feature, welches von einem anderen Nutzer veröffentlicht wurde.
</p> </p>
<blockquote> <blockquote>
git flow feature pull origin 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> <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>
@ -254,29 +259,41 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="release" href="#release">Make a release</a></h2> <h2><a name="release" href="#release">Erstelle ein Release</a></h2>
<ul> <ul>
<li>Support preparation of a new production release</li> <li>Unterstützt die Fertigstellung einer Produktionsversion.</li>
<li>Allow for minor bug fixes and preparing meta-data for a release</li> <li>Erlaubt geringfügige Bugfixes und die Erstellung der Metadaten für ein Release</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Start a release</h3> <h3>Beginne ein Release</h3>
<p>To start a release, use the git flow release command. It creates a release branch created from the 'develop' branch.</p> <p>
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>You can optionally supply a <code>[BASE]</code> commit sha-1 hash to start the release from. The commit must <p>
be on the Du kannst optional einen <code>[BASE]</code> Commit sha-1 Hash bereitstellen,
'develop' branch.</p> um ein Release von diesem Commit zu starten. Der Commit muss sich im 'develop'-Branch befinden.
</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>(You can track a remote release with the <br/><code>git flow release track RELEASE</code> command)</p> <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>
@ -285,19 +302,22 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish up a release</h3> <h3>Fertigstellung eines Releases</h3>
<p>Finishing a release is one of the big steps in git branching. It performs several actions:</p> <p>
Das Beenden eines Releases ist einer der größten Schritte im Git-Branching-Prozess.
Es bewirkt folgende Aktionen:
</p>
<ul> <ul>
<li>Merges the release branch back into 'master'</li> <li>Zusammenführen des Release-Branches zurück in den 'master'-Branch. (Merge-Prozess)</li>
<li>Tags the release with its name</li> <li>Markiert (Tagged) das Release mit seinem Namen</li>
<li>Back-merges the release into 'develop'</li> <li>Zurückführen des Releases in den 'develop'-Branch (Merge-Prozess)</li>
<li>Removes the release branch</li> <li>Entfernt den 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> <p>Vergesse nicht Deine Tags mittels <code>git push --tags</code> zu pushen.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
@ -310,19 +330,28 @@
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2> <h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
<ul> <ul>
<li>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version <li>
Hotfixes 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>Like the other git flow commands, a hotfix is started with</p> <p>Ähnlich wie auch die anderen git-flow Befehle, wird ein Hotfix mittels</p>
<blockquote> <blockquote>
git flow hotfix start VERSION [BASENAME] git flow hotfix start VERSION [BASENAME]
</blockquote> </blockquote>
<p>The version argument hereby marks the new hotfix release name. Optionally you can specify a basename to start from.</p> <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>
@ -331,9 +360,13 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish a hotfix</h3> <h3>Fertigstellung eines Hotfixes</h3>
<p>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version.</p> <p>
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>
@ -353,7 +386,7 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="commands" href="#commands">Commands</a></h2> <h2><a name="commands" href="#commands">Befehle</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands"/>
</div> </div>
@ -361,12 +394,10 @@
<h2>Backlog</h2> <h2>Backlog</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Not all available commands are covered here, only the most important ones</li> <li>Nicht alle verfügbaren Befehle sind hier abgedeckt, nur die wichtigsten.</li>
<li>You can still use git and all its commands normally as you know them, git flow is only a tooling <li>Du kannst weiterhin alle Git-Befehle normal nutzen, wie Du es gewohnt bist. Git-flow ist nur eine Werkzeugsammlung.</li>
collection <li>Das 'support' Feature ist noch Beta und die Nutzung nicht empfohlen.</li>
</li> <li>Wenn Du Übersetzungen beisteuern möchtest, würde ich mich freuen diese zu integrieren.</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>
@ -376,7 +407,7 @@
<footer> <footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Comments</a></h2> <h2><a name="comments" href="#comments">Kommentare</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>
@ -395,9 +426,9 @@
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
})(); })();
</script> </script>
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a> <noscript>Bitte aktiviere Javascript um die Kommentare zu sehen. <a href="http://disqus.com/?ref_noscript">Powered by Disqus.</a>
</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">Kommentare powered by <span class="logo-disqus">Disqus</span></a>
</body> </body>

158
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">
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> creado por <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a> <a 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,15 +45,14 @@
} }
}(document, "script", "twitter-wjs");</script> }(document, "script", "twitter-wjs");</script>
</p> </p>
<p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p> <p id="desc">ramificaciones eficientes usando git-flow, por <a href="http://nvie.com/">Vincent Driessen</a></p>
<p id="translations">translations: <p id="translations">traducciones:
<a href="#" class="active" title="english">English</a> - <a href="index.html" title="english">English</a> -
<a href="index.es_ES.html" title="spanish">Castellano</a> - <a href="#" class="active" title="spanish">Castellano</a> -
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> - <a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional 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.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> -
@ -68,38 +67,38 @@
<div class="scrollblock"> <div class="scrollblock">
<h2>About</h2> <h2>Acerca de git-flow</h2>
<p> <p>
git-flow are a set of git extensions to provide high-level repository operations for Vincent git-flow es un conjunto de extensiones para git que proveen comandos de alto nivel para operar repositorios
Driessen's branching model. basados en el modelo de ramificaciones de Vincent
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">more</a></small> Driessen.
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">más</a></small>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>This cheatsheet shows the basic usage and effect of git-flow operations</p> <p>Esta hoja de referencia explica&nbsp; las operaciones básicas de git-flow, los comandos y sus efectos.</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Basic tips</h2> <h2>Consejos básicos</h2>
<ul> <ul>
<li>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li> <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>The OSX/Windows Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides <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
git-flow support
</li> </li>
<li>Git-flow is a merge based solution. It doesn't rebase feature branches.</li> <li>- Git-flow funciona basándose en fusiones de ramas (merge). No reorganiza (branch rebase) las ramas de características (feature branches).</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="setup" href="#setup">Setup</a></h2> <h2><a name="setup" href="#setup">Configuración</a></h2>
<ul> <ul>
<li>You need a working git installation as prerequisite.</li> <li>Un prerequisito es una instalación de git en funcionamiento.</li>
<li>Git flow works on OSX, Linux and Windows</li> <li>Git flow funciona en OSX, Linux y 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">
@ -121,31 +120,30 @@
$ 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> <p>Necesitarás wget y util-linux para instalar git-flow.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <p>
For detailed git flow intallation instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow Para instrucciones de instalación detalladas, por favor, visite la <a href="https://github.com/nvie/gitflow/wiki/Windows">wiki de 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">Getting started</a></h2> <h2><a name="getting_started" href="#getting_started">Introducción</a></h2>
<p>Git flow needs to be initialized in order to customize your project setup.</p> <p>Git flow necesita ser inicializado para poder alterar la configuración del proyecto.</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Initialize</h3> <h3>Inicialización</h3>
<p>Start using git-flow by initializing it inside an existing git repository:</p> <p>Comience a usar git-flow inicializándolo desde dentro de un repositorio git existente:</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/> Deberá contestar algunas preguntas relacionadas con las convenciones de nombres para las ramas.<br/>
It's recommended to use the default values. Se recomienda utilizar los valores predeterminados.
</p> </p>
</div> </div>
@ -159,22 +157,22 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="features" href="#features">Features</a></h2> <h2><a name="features" href="#features">Características</a></h2>
<ul class="narrow"> <ul class="narrow">
<li>Develop new features for upcoming releases</li> <li>Desarrollar características para futuras versiones</li>
<li>Typically exist in developers repos only</li> <li>Es típico que sólo se use en los repositorios para desarrollo</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Start a new feature</h3> <h3>Comenzar una nueva característica</h3>
<p>Development of new features starting from the 'develop' branch.</p> <p>El desarrollo de nuevas características parte de la rama 'develop'.</p>
<p>Start developing a new feature with</p> <p>Comienze una nueva característica usando</p>
<blockquote> <blockquote>
git flow feature start MYFEATURE git flow feature start MYFEATURE
</blockquote> </blockquote>
<p>This action creates a new feature branch based on 'develop' and switches to it</p> <p>Esta acción crea una nueva rama derivada de 'develop' y luego cambia el código a esta rama.</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -194,16 +192,16 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish up a feature</h3> <h3>Terminar una característica</h3>
<p> <p>
Finish the development of a feature. Terminar el desarrollo de una característica.
This action performs the following Esta acción realiza lo siguiente:
</p> </p>
<ul> <ul>
<li>Merged MYFEATURE into 'develop'</li> <li>Fusiona MYFEATURE en 'develop'</li>
<li>Removes the feature branch</li> <li>Borra la rama MYFEATURE</li>
<li>Switches back to 'develop' branch</li> <li>Establece como versión de trabajo la rama 'develop'</li>
</ul> </ul>
<blockquote> <blockquote>
@ -217,11 +215,11 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Publish a feature</h3> <h3>Publicar una característica</h3>
<p> <p>
Are you developing a feature in collaboration? <br/> ¿Estás trabajando colaborativamente? <br/>
Publish a feature to the remote server so it can be used by other users. Publica una característica a un servidor remoto para que así pueda ser vista por otros.
</p> </p>
<blockquote> <blockquote>
@ -235,17 +233,15 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Getting a published feature</h3> <h3>Obteniendo características publicadas</h3>
<p> <p>
Get a feature published by another user. Descarga una característica publicada por otro y mantiene un seguimiento de sus cambios.
</p> </p>
<blockquote> <blockquote>
git flow feature pull origin MYFEATURE git flow feature pull 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>
@ -254,29 +250,30 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="release" href="#release">Make a release</a></h2> <h2><a name="release" href="#release">Publica una versión</a></h2>
<ul> <ul>
<li>Support preparation of a new production release</li> <li>Prepara una versión para producción</li>
<li>Allow for minor bug fixes and preparing meta-data for a release</li> <li>Permite arreglos menores y la preparación de los metadatos para la publicación</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Start a release</h3> <h3>Comienza una publicación</h3>
<p>To start a release, use the git flow release command. It creates a release branch created from the 'develop' branch.</p> <p>Para comenzar una publicación, usa el comando git flow release. Creará</p>
una rama de publicación derivada de la rama 'develop'.
</p>
<blockquote> <blockquote>
git flow release start RELEASE [BASE] git flow release start RELEASE [BASE]
</blockquote> </blockquote>
<p>You can optionally supply a <code>[BASE]</code> commit sha-1 hash to start the release from. The commit must <p>Opcionalmente, puede usar <code>[BASE]</code> indicando el código sha-1 del cambio desde el cual comenzar la versión de
be on the publicación. El cambio debe ser parte de la rama 'develop'.</p>
'develop' branch.</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>It's wise to publish the release branch after creating it to allow release commits by other developers. Do it similar to feature publishing with the command:</p> <p>Es apropiado publicar remotamente la rama de publicación después de crearla para permitir que otros desarrolladores envíen cambios para esta versión. Hazlo de forma similar a publicar características:</p>
<blockquote> <blockquote>
git flow release publish RELEASE git flow release publish RELEASE
</blockquote> </blockquote>
<p>(You can track a remote release with the <br/><code>git flow release track RELEASE</code> command)</p> <p>(Puede establecer el seguimiento de los cambios de la publicación remota utilizando el comando <br/><code>git flow release track RELEASE</code></p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
@ -285,20 +282,18 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish up a release</h3> <h3>Concluir una publicación</h3>
<p>Finishing a release is one of the big steps in git branching. It performs several actions:</p> <p>Dar cierre a una publicación es un gran paso. Realiza varias acciones:</p>
<ul> <ul>
<li>Merges the release branch back into 'master'</li> <li>Fusiona la rama de la publicación con la rama 'master'</li>
<li>Tags the release with its name</li> <li>Etiqueta el cambio con su nombre</li>
<li>Back-merges the release into 'develop'</li> <li>Vuelve a fusionar la publicación con la rama 'develop'</li>
<li>Removes the release branch</li> <li>Borra la rama de la publicación</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>
@ -307,22 +302,22 @@
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2> <h2><a name="hotfixes" href="#hotfixes">Revisiones</a></h2>
<ul> <ul>
<li>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version <li>Las revisiones surgen de la necesidad de actuar inmediatamente cuando la versión ejecutándose en producción se encuentra en un estado que no deseamos
</li> </li>
<li>May be branched off from the corresponding tag on the master branch that marks the production version.</li> <li>Puede ramificarse desde la versión correspondiente etiquetada en la rama 'master' que corresponda a la versión en producción.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>git flow hotfix start</h3> <h3>git flow hotfix start</h3>
<p>Like the other git flow commands, a hotfix is started with</p> <p>Como otros comandos de git flow, una revisión se abre con</p>
<blockquote> <blockquote>
git flow hotfix start VERSION [BASENAME] git flow hotfix start VERSION [BASENAME]
</blockquote> </blockquote>
<p>The version argument hereby marks the new hotfix release name. Optionally you can specify a basename to start from.</p> <p>El argumento de la versión determina el nombre de la revisión. Opcionalmente, puede agregar un nombre para la base desde la cual comenzar.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
@ -331,9 +326,9 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish a hotfix</h3> <h3>Cierra una revisión</h3>
<p>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version.</p> <p>Al cerrar una revisión, esta se fusiona en las ramas 'develop' y 'master'. Luego, el cambio en 'master' es etiquetado con el nombre de la revisión.</p>
<blockquote> <blockquote>
git flow hotfix finish VERSION git flow hotfix finish VERSION
</blockquote> </blockquote>
@ -353,20 +348,19 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="commands" href="#commands">Commands</a></h2> <h2><a name="commands" href="#commands">Comandos</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands"/>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Backlog</h2> <h2>Tareas pendientes</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Not all available commands are covered here, only the most important ones</li> <li>Aquí no se han cubierto todos los comandos disponibles, sólo los más importantes</li>
<li>You can still use git and all its commands normally as you know them, git flow is only a tooling <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.
collection
</li> </li>
<li>The 'support' feature is still beta, using it is not advised</li> <li>La característica 'support' aún esta en fase beta y no se recomienda usarla</li>
<li>If you'd like to supply translations I'd be happy to integrate them</li> <li>Si quiere proveer traducciones, serán bien recibidas.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
@ -376,7 +370,7 @@
<footer> <footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Comments</a></h2> <h2><a name="comments" href="#comments">Comentarios</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>

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

149
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 me on GitHub</a></div> <div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork su 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">
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> creato da <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a> <a 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,9 +45,9 @@
} }
}(document, "script", "twitter-wjs");</script> }(document, "script", "twitter-wjs");</script>
</p> </p>
<p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p> <p id="desc">branching efficiente usando git-flow realizzato da <a href="http://nvie.com/">Vincent Driessen</a></p>
<p id="translations">translations: <p id="translations">traduzioni:
<a href="#" class="active" title="english">English</a> - <a href="index.html" title="english">English</a> -
<a href="index.es_ES.html" title="spanish">Castellano</a> - <a href="index.es_ES.html" title="spanish">Castellano</a> -
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> - <a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - <a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
@ -56,7 +56,7 @@
<a href="index.tr_TR.html" title="Turkce">Türkçe</a> - <a href="index.tr_TR.html" title="Turkce">Türkçe</a> -
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> - <a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
<a href="index.fr_FR.html" title="Français">Français</a> - <a href="index.fr_FR.html" title="Français">Français</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="#" title="Italiano" class="active">Italiano</a> -
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> - <a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
<a href="index.de_DE.html" title="German">Deutsch (German)</a> - <a href="index.de_DE.html" title="German">Deutsch (German)</a> -
@ -68,28 +68,27 @@
<div class="scrollblock"> <div class="scrollblock">
<h2>About</h2> <h2>Introduzione</h2>
<p> <p>
git-flow are a set of git extensions to provide high-level repository operations for Vincent git-flow è un set di estensioni di git che offre dei comandi di alto livello sul repository per utilizzare il modello di branching di Vincent
Driessen'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/">maggiori informazioni</a></small>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>This cheatsheet shows the basic usage and effect of git-flow operations</p> <p>Questo cheatsheet mostra l'utilizzo di base a gli effetti dei comandi offerti da git-flow</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Basic tips</h2> <h2>Consigli di base</h2>
<ul> <ul>
<li>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li> <li>Git flow offre un eccelente guida e un ottimo output da linea di comando. Leggeteli attentamente per vedere cosa sta succedendo...</li>
<li>The OSX/Windows Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides <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
git-flow support
</li> </li>
<li>Git-flow is a merge based solution. It doesn't rebase feature branches.</li> <li>Git-flow è una soluzione basata sul merge. Non esegue il rebase su i feature branch.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
@ -98,8 +97,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>You need a working git installation as prerequisite.</li> <li>È necessario un'installazione di git funzionante come prerequisito.</li>
<li>Git flow works on OSX, Linux and Windows</li> <li>Git flow funziona su OSX, Linux e Windows</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
@ -121,31 +120,30 @@
$ 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> <p>Sono necessari wget e util-linux per installare git-flow.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <p>
For detailed git flow intallation instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow 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>.
wiki</a>.
</p> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow"/>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">Getting started</a></h2> <h2><a name="getting_started" href="#getting_started">Per Iniziare</a></h2>
<p>Git flow needs to be initialized in order to customize your project setup.</p> <p>Git flow ha la necessità di essere inizializzato per personalizzare il setup del progetto.</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Initialize</h3> <h3>Inizializzazione</h3>
<p>Start using git-flow by initializing it inside an existing git repository:</p> <p>Iniziate ad utilizzare git-flow inizializzandolo all'interno di un repository git esistente:</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/> Dovrete rispondere ad alcune domande riguardanti la naming conventions per i tuoi branch.<br/>
It's recommended to use the default values. Si raccomanda l'uso dei valori di default.
</p> </p>
</div> </div>
@ -159,22 +157,22 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="features" href="#features">Features</a></h2> <h2><a name="features" href="#features">Features (Funzionalità)</a></h2>
<ul class="narrow"> <ul class="narrow">
<li>Develop new features for upcoming releases</li> <li>Sviluppare nuove features per le releases in arrivo</li>
<li>Typically exist in developers repos only</li> <li>Generalmente sono presenti solo nei repository di sviluppo</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Start a new feature</h3> <h3>Iniziare una nuova feature</h3>
<p>Development of new features starting from the 'develop' branch.</p> <p>Lo sviluppo di nuove feature cominica dal branch 'develop'.</p>
<p>Start developing a new feature with</p> <p>Iniziate lo sviluppo di una nuova feature con</p>
<blockquote> <blockquote>
git flow feature start MYFEATURE git flow feature start MYFEATURE
</blockquote> </blockquote>
<p>This action creates a new feature branch based on 'develop' and switches to it</p> <p>Questa crea un nuovo feature branch basato su 'develop' e si sposta su quello</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -194,16 +192,16 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish up a feature</h3> <h3>Terminare una feature</h3>
<p> <p>
Finish the development of a feature. Termina lo sviluppo di una feature.
This action performs the following Questa azione esegue le seguenti operazioni
</p> </p>
<ul> <ul>
<li>Merged MYFEATURE into 'develop'</li> <li>Merge del branch MYFEATURE all'inteno di 'develop'</li>
<li>Removes the feature branch</li> <li>Rimuove il feature branch</li>
<li>Switches back to 'develop' branch</li> <li>Si sposta di nuovo sul branch 'develop'</li>
</ul> </ul>
<blockquote> <blockquote>
@ -217,11 +215,11 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Publish a feature</h3> <h3>Pubblicare una feature</h3>
<p> <p>
Are you developing a feature in collaboration? <br/> State sviluppando una feature in collaborazione con altri?<br/>
Publish a feature to the remote server so it can be used by other users. Pubblicate una feature sul server remoto in modo che possa essere utilizzata da altri utenti.
</p> </p>
<blockquote> <blockquote>
@ -235,17 +233,17 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Getting a published feature</h3> <h3>Scaricare una feature pubblicata</h3>
<p> <p>
Get a feature published by another user. Scaricare una feature pubblicata da un altro utente.
</p> </p>
<blockquote> <blockquote>
git flow feature pull origin 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> <p>Potete tracciare una feature sul repository origin usando <code> git flow feature track MYFEATURE</code> </p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
@ -254,29 +252,28 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="release" href="#release">Make a release</a></h2> <h2><a name="release" href="#release">Creare una release</a></h2>
<ul> <ul>
<li>Support preparation of a new production release</li> <li>Supporto alla preparazione di una nuova release di produzione</li>
<li>Allow for minor bug fixes and preparing meta-data for a release</li> <li>Consente di eseguire bug fixes minori e preparare i meta-dati per la release</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Start a release</h3> <h3>Iniziare una release</h3>
<p>To start a release, use the git flow release command. It creates a release branch created from the 'develop' branch.</p> <p>Per iniziare una release usate il comando release di git flow. Crea un release branch a partire dal branch 'develop'.
</p>
<blockquote> <blockquote>
git flow release start RELEASE [BASE] git flow release start RELEASE [BASE]
</blockquote> </blockquote>
<p>You can optionally supply a <code>[BASE]</code> commit sha-1 hash to start the release from. The commit must <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>
be on the
'develop' branch.</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>It's wise to publish the release branch after creating it to allow release commits by other developers. Do it similar to feature publishing with the command:</p> <p>È una buona idea pubblicare il release branch dopo averlo creato in modo da consentire l'invio di release commit anche da parte di altri sviluppatori. Potete farlo, usando un comando analogo a quello per pubblicare le features, con il comando:</p>
<blockquote> <blockquote>
git flow release publish RELEASE git flow release publish RELEASE
</blockquote> </blockquote>
<p>(You can track a remote release with the <br/><code>git flow release track RELEASE</code> command)</p> <p>(Potete tracciare la release remota con il comando <code>git flow release track RELEASE</code>)</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
@ -285,19 +282,19 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish up a release</h3> <h3>Terminare una release</h3>
<p>Finishing a release is one of the big steps in git branching. It performs several actions:</p> <p>Terminare una release è uno dei passi più grandi nella gestione dei branch di git. Vengono eseguite svariate operazioni:</p>
<ul> <ul>
<li>Merges the release branch back into 'master'</li> <li>Merge del release branch su branch 'master'</li>
<li>Tags the release with its name</li> <li>Tag della relase con il suo nome</li>
<li>Back-merges the release into 'develop'</li> <li>Merge all'indietro della relase sul branch 'develop'</li>
<li>Removes the release branch</li> <li>Rimozione del 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> <p>Non dimenticate di fare il push dei tag creati con <code>git push --tags</code></p>
</div> </div>
<div class="col-2"> <div class="col-2">
@ -310,19 +307,18 @@
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2> <h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
<ul> <ul>
<li>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version <li>Gli Hotfixes nascono dalla necessità di agire immediatamente di fronte ad uno stato indesiderato della versione live di produzione.</li>
</li> <li>Possono essere fatti partire dal tag corrispondente sul branch master che contrassegna la versione di produzione.</li>
<li>May be branched off from the corresponding tag on the master branch that marks the production version.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>git flow hotfix start</h3> <h3>git flow hotfix start</h3>
<p>Like the other git flow commands, a hotfix is started with</p> <p>Come gli altri comandi di git flow, un hotfix comincia con</p>
<blockquote> <blockquote>
git flow hotfix start VERSION [BASENAME] git flow hotfix start VERSION [BASENAME]
</blockquote> </blockquote>
<p>The version argument hereby marks the new hotfix release name. Optionally you can specify a basename to start from.</p> <p>La versione passata come argomento definisce il nuovo nome dell'hotfix release. Facoltativamente potete specificare un basename da cui partire.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
@ -331,9 +327,9 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish a hotfix</h3> <h3>Terminare un hotfix</h3>
<p>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version.</p> <p>Terminando un hotfix, esso viene integrato (merge) all'indietro all'interno di 'develop' e di 'master'. In aggiunta il master viene taggato con la versone dell'hotfix.</p>
<blockquote> <blockquote>
git flow hotfix finish VERSION git flow hotfix finish VERSION
</blockquote> </blockquote>
@ -353,7 +349,7 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="commands" href="#commands">Commands</a></h2> <h2><a name="commands" href="#commands">Comandi</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands"/>
</div> </div>
@ -361,12 +357,11 @@
<h2>Backlog</h2> <h2>Backlog</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Not all available commands are covered here, only the most important ones</li> <li>Non tutti i comandi disponibili sono riportati qui, solo i più importanti</li>
<li>You can still use git and all its commands normally as you know them, git flow is only a tooling <li>Potete comunque usare git e tutti i suoi comandi normalmente come li conoscete, git flow è solo una collezione di strumenti aggiuntivi.
collection
</li> </li>
<li>The 'support' feature is still beta, using it is not advised</li> <li>La funzionalità 'support' è ancora in beta, 'utilizzo non è consigliato</li>
<li>If you'd like to supply translations I'd be happy to integrate them</li> <li>Se volete fornire una traduzione sarò felice di integrarla</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
@ -376,7 +371,7 @@
<footer> <footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Comments</a></h2> <h2><a name="comments" href="#comments">Commenti</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>

129
index.ja_JP.html
View File

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

132
index.ko_KR.html
View File

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

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

187
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>git-flow cheatsheet</title> <title>cheatsheet do git-flow</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 me on GitHub</a></div> <div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork no GitHub</a></div>
<header> <header>
<h1 id="title">git-flow cheatsheet</h1> <h1 id="title">cheatsheet do git-flow</h1>
<p id="author"> <p id="author">
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> criado por <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a> <a 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,11 @@
} }
}(document, "script", "twitter-wjs");</script> }(document, "script", "twitter-wjs");</script>
</p> </p>
<p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p> <p id="desc">sistema de branches eficiente usando o git-flow, do <a href="http://nvie.com/">Vincent Driessen</a></p>
<p id="translations">translations: <p id="translations">traduções:
<a href="#" class="active" title="english">English</a> - <a href="index.html" title="Inglês">English</a> -
<a href="index.es_ES.html" title="spanish">Castellano</a> - <a href="index.es_ES.html" title="spanish">Castellano</a> -
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> - <a href="#" class="active" title="Português Brasileiro">Português Brasileiro</a> -
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - <a href="index.zh_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> -
@ -68,38 +68,38 @@
<div class="scrollblock"> <div class="scrollblock">
<h2>About</h2> <h2><a name="sobre" href="#sobre" >Sobre</a></h2>
<p> <p>
git-flow are a set of git extensions to provide high-level repository operations for Vincent O git-flow é um conjunto de extensões para o git que provê operações de alto-nível para
Driessen's branching model. repositórios usando o modelo de branches do Vincent 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/">mais</a></small>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>This cheatsheet shows the basic usage and effect of git-flow operations</p> <p>Este cheatsheet demonstra o uso básico e o efeito das operações do git-flow</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Basic tips</h2> <h2><a name="dicas_basicas" href="#dicas_basicas" >Dicas básicas</a></h2>
<ul> <ul>
<li>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li> <li>O git-flow oferece na linha de comando ajuda e saídas excelentes. Leia atentamente para ver o que está
<li>The OSX/Windows Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides acontecendo...</li>
git-flow support <li>O cliente do OSX <a href="http://www.sourcetreeapp.com/">Sourcetree</a> é um excelente gui para o git e
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="setup" href="#setup">Setup</a></h2> <h2><a name="instalacao" href="#instalacao" >Instalação</a></h2>
<ul> <ul>
<li>You need a working git installation as prerequisite.</li> <li>Você precisa do git instalado como pré-requisito.</li>
<li>Git flow works on OSX, Linux and Windows</li> <li>O git flow funciona no OSX, Linux e no 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">
@ -121,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>
For detailed git flow intallation instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow Para instruções detalhadas sobre a instalação, visite
wiki</a>. a <a href="https://github.com/nvie/gitflow/wiki/Windows">wiki
do git-flow</a>.
</p> </p>
<img src="img/download.png" alt="install git-flow"/> <img src="img/download.png" alt="install git-flow"/>
</div> </div>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">Getting started</a></h2> <h2><a name="comecando" href="#comecando" >Começando</a></h2>
<p>Git flow needs to be initialized in order to customize your project setup.</p> <p>O git-flow precisa ser inicializado para personalizar a configuração de seu projeto.</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Initialize</h3> <h3>Inicialização</h3>
<p>Start using git-flow by initializing it inside an existing git repository:</p> <p>Comece o uso do git-flow fazendo sua inicialização dentro de um repositório git existente:</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/> Você precisa responder algumas questões relativas às convenções de nomenclatura dos seus branches.<br/>
It's recommended to use the default values. É recomendado que sejam usados os valores padrões.
</p> </p>
</div> </div>
@ -159,33 +159,22 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="features" href="#features">Features</a></h2> <h2><a name="features" href="#features" >Funcionalidades/features</a></h2>
<ul class="narrow"> <ul class="narrow">
<li>Develop new features for upcoming releases</li> <li>Desenvolva novas funcionalidades para as versões futuras</li>
<li>Typically exist in developers repos only</li> <li>Normalmente existem apenas nos repositórios dos desenvolvedores</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Start a new feature</h3> <h3>Começar uma nova funcionalidade</h3>
<p>Development of new features starting from the 'develop' branch.</p> <p>O desenvolvimento de novas funcionalidades começa no branch 'develop'.</p>
<p>Start developing a new feature with</p> <p>Comece o desenvolvimento de uma nova funcionalidade com</p>
<blockquote> <blockquote>
git flow feature start MYFEATURE git flow feature start MYFEATURE
</blockquote> </blockquote>
<p>This action creates a new feature branch based on 'develop' and switches to it</p> <p>Esse comando cria um novo branch da funcionalidade baseado no 'develop' e alterna para ele</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>
@ -194,16 +183,16 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish up a feature</h3> <h3>Finalizar uma funcionalidade</h3>
<p> <p>
Finish the development of a feature. Finaliza o desenvolvimento de uma funcionalidade.
This action performs the following Esse comando faz o seguinte
</p> </p>
<ul> <ul>
<li>Merged MYFEATURE into 'develop'</li> <li>Mescla MYFEATURE no 'develop'</li>
<li>Removes the feature branch</li> <li>Remove o branch da funcionalidade</li>
<li>Switches back to 'develop' branch</li> <li>Volta para o branch 'develop'</li>
</ul> </ul>
<blockquote> <blockquote>
@ -217,11 +206,12 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Publish a feature</h3> <h3>Publicar uma funcionalidade</h3>
<p> <p>
Are you developing a feature in collaboration? <br/> Você está desenvolvendo uma funcionalidade colaborativamente? <br/>
Publish a feature to the remote server so it can be used by other users. Publique uma funcionalidade para o servidor remoto, assim ela pode ser
utilizada por outros usuários.
</p> </p>
<blockquote> <blockquote>
@ -235,17 +225,16 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Getting a published feature</h3> <h3>Obter uma funcionalidade publicada</h3>
<p> <p>
Get a feature published by another user. Obtenha uma funcionalidade publicada por outro usuário e acompanhe
as alterações remotas.
</p> </p>
<blockquote> <blockquote>
git flow feature pull origin MYFEATURE git flow feature pull 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>
@ -254,29 +243,31 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="release" href="#release">Make a release</a></h2> <h2><a name="release" href="#release" >Criar uma versão/release</a></h2>
<ul> <ul>
<li>Support preparation of a new production release</li> <li>Auxilia a preparação de uma nova versão de produção</li>
<li>Allow for minor bug fixes and preparing meta-data for a release</li> <li>Permite correções de bugs menores e a preparação de metadados de uma versão</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Start a release</h3> <h3>Começar uma versão</h3>
<p>To start a release, use the git flow release command. It creates a release branch created from the 'develop' branch.</p> <p>Para começar uma versão, use o comando git flow release. Ele<br/>
cria um branch da versão baseado no branch 'develop'.
</p>
<blockquote> <blockquote>
git flow release start RELEASE [BASE] git flow release start RELEASE [BASE]
</blockquote> </blockquote>
<p>You can optionally supply a <code>[BASE]</code> commit sha-1 hash to start the release from. The commit must <p>Você pode opcionalmente fornecer um hash sha-1 do commit <code>[BASE]</code> de onde começar a versão. O
be on the commit precisa estar no branch 'develop'</p>
'develop' branch.</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>It's wise to publish the release branch after creating it to allow release commits by other developers. Do it similar to feature publishing with the command:</p> <p>É sensato publicar o branch da versão depois de criá-lo, para permitir commits por outros
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>(You can track a remote release with the <br/><code>git flow release track RELEASE</code> command)</p> <p>(Você pode acompanhar uma versão remota com o comando <br/><code>git flow release track RELEASE</code>)</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
@ -285,20 +276,18 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish up a release</h3> <h3>Finalizar uma versão</h3>
<p>Finishing a release is one of the big steps in git branching. It performs several actions:</p> <p>A finalização de uma versão é um dos grandes passos na ramificação/branching do git. Ele executa várias ações:</p>
<ul> <ul>
<li>Merges the release branch back into 'master'</li> <li>Mescla o branch da versão no 'master'</li>
<li>Tags the release with its name</li> <li>Etiqueta a versão com seu nome</li>
<li>Back-merges the release into 'develop'</li> <li>Mescla o branch da versão de volta no 'develop'</li>
<li>Removes the release branch</li> <li>Remove o branch da versão</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>
@ -307,22 +296,21 @@
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2> <h2><a name="hotfixes" href="#hotfixes" >Hotfixes</a></h2>
<ul> <ul>
<li>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version <li>Os hotfixes surgem da necessidade de agir imediatamente sobre uma situação indesejada na versão de produção ativa</li>
</li> <li>Pode ser criado a partir da tag correspondente no branch master que indica a versão em produção.</li>
<li>May be branched off from the corresponding tag on the master branch that marks the production version.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>git flow hotfix start</h3> <h3>git flow hotfix start</h3>
<p>Like the other git flow commands, a hotfix is started with</p> <p>Assim como os outros comandos do git flow, um hotfix inicia com</p>
<blockquote> <blockquote>
git flow hotfix start VERSION [BASENAME] git flow hotfix start RELEASE
</blockquote> </blockquote>
<p>The version argument hereby marks the new hotfix release name. Optionally you can specify a basename to start from.</p> <p>O argumento release nesse caso marca a versão defeituosa na produção</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
@ -331,11 +319,11 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish a hotfix</h3> <h3>Finalizar um hotfix</h3>
<p>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version.</p> <p>Ao finalizar um hotfix ele é mesclado tanto no develop quanto no master. Além disso, o merge no master é etiquetado.</p>
<blockquote> <blockquote>
git flow hotfix finish VERSION git flow hotfix finish RELEASE
</blockquote> </blockquote>
</div> </div>
<div class="col-2"> <div class="col-2">
@ -353,7 +341,7 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="commands" href="#commands">Commands</a></h2> <h2><a name="comandos" href="#comandos" >Comandos</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands"/>
</div> </div>
@ -361,12 +349,11 @@
<h2>Backlog</h2> <h2>Backlog</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Not all available commands are covered here, only the most important ones</li> <li>Nem todos os comandos disponíveis estão cobertos aqui, apenas os mais importantes deles</li>
<li>You can still use git and all its commands normally as you know them, git flow is only a tooling <li>Você pode continuar a usar o git e todos os comandos dele normalmente como você já conhece, o git flow
collection é apenas uma coleção de ferramentas</li>
</li> <li>A funcionalidade 'support' continua no estágio beta, seu uso não é indicado</li>
<li>The 'support' feature is still beta, using it is not advised</li> <li>Se você quiser fornecer traduções, ficarei feliz de integrá-las</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>
@ -376,7 +363,7 @@
<footer> <footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Comments</a></h2> <h2>Comentários</h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>
@ -395,9 +382,9 @@
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
})(); })();
</script> </script>
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a> <noscript>Habilite o JavaScript para ver os <a href="http://disqus.com/?ref_noscript">comentários criados com o Disqus.</a>
</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">comentários criados com o <span class="logo-disqus">Disqus</span></a>
</body> </body>

173
index.ru_RU.html
View File

@ -3,11 +3,20 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>git-flow cheatsheet</title> <title>Шпаргалка по git-flow</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>
@ -30,10 +39,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 cheatsheet</h1> <h1 id="title">Шпаргалка по git-flow</h1>
<p id="author"> <p id="author">
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> создал <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a> <a 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,9 +54,9 @@
} }
}(document, "script", "twitter-wjs");</script> }(document, "script", "twitter-wjs");</script>
</p> </p>
<p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p> <p id="desc">эффективное ветвление с помощью git-flow от <a href="http://nvie.com/">Vincent Driessen</a></p>
<p id="translations">translations: <p id="translations">переводы:
<a href="#" class="active" title="english">English</a> - <a href="index.html" title="english">English</a> -
<a href="index.es_ES.html" title="spanish">Castellano</a> - <a href="index.es_ES.html" title="spanish">Castellano</a> -
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> - <a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> - <a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional Chinese)</a> -
@ -57,8 +66,7 @@
<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="index.nl_NL.html" title="Nederlands">Nederlands</a> - <a href="#" class="active" title="Russian">Русский (Russian)</a> -
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
<a href="index.de_DE.html" title="German">Deutsch (German)</a> - <a href="index.de_DE.html" title="German">Deutsch (German)</a> -
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a> <a href="index.ca_CA.html" title="Català">Català (Catalan)</a>
</p> </p>
@ -68,38 +76,37 @@
<div class="scrollblock"> <div class="scrollblock">
<h2>About</h2> <h2>Введение</h2>
<p> <p>
git-flow are a set of git extensions to provide high-level repository operations for Vincent git-flow — это набор расширений git предоставляющий высокоуровневые операции над репозиторием для поддержки модели ветвления 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/">узнать больше</a></small>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>This cheatsheet shows the basic usage and effect of git-flow operations</p> <p>Эта шпаргалка показывает основные способы использования операций git-flow.</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Basic tips</h2> <h2>Общие замечания</h2>
<ul> <ul>
<li>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li> <li>Git flow предоставляет превосходную командную строку со справкой и улучшенными выводом. Внимательно читайте его, чтобы знать, что происходит...</li>
<li>The OSX/Windows Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides <li>Клиент для OSX/Windows <a href="http://www.sourcetreeapp.com/">Sourcetree</a> — отличный GUI для Git — также поддерживает git-flow
git-flow support
</li> </li>
<li>Git-flow is a merge based solution. It doesn't rebase feature branches.</li> <li>Git-flow основан на слиянии. Для слияния веток фич не используется rebase.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="setup" href="#setup">Setup</a></h2> <h2><a name="setup" href="#setup">Установка</a></h2>
<ul> <ul>
<li>You need a working git installation as prerequisite.</li> <li>В первую очередь вам нужна рабочая установка git</li>
<li>Git flow works on OSX, Linux and Windows</li> <li>Git flow работает на OSX, Linux и 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">
@ -121,11 +128,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>You need wget and util-linux to install git-flow.</p> <p>Вам потребуется wget и util-linux для установки git-flow.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <p>
For detailed git flow intallation instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow Подробные инструкции по установке git flow смотрите на <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"/>
@ -133,19 +140,19 @@
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">Getting started</a></h2> <h2><a name="getting_started" href="#getting_started">Приступая к работе</a></h2>
<p>Git flow needs to be initialized in order to customize your project setup.</p> <p>Git flow нужно инициализировать, чтобы настроить его для работы с вашим проектом.</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Initialize</h3> <h3>Инициализация</h3>
<p>Start using git-flow by initializing it inside an existing git repository:</p> <p>Для начала использования git-flow проинициализируйте его внутри существующего git-репозитория:</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/> Вам придётся ответить на несколько вопросов о способах именования ваших веток.<br/>
It's recommended to use the default values. Рекомендуется оставить значения по умолчанию.
</p> </p>
</div> </div>
@ -159,22 +166,22 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="features" href="#features">Features</a></h2> <h2><a name="features" href="#features">Фичи</a></h2>
<ul class="narrow"> <ul class="narrow">
<li>Develop new features for upcoming releases</li> <li>Разработка новых фич для последующих релизов</li>
<li>Typically exist in developers repos only</li> <li>Обычно присутствует только в репозиториях разработчиков</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Start a new feature</h3> <h3>Начало новой фичи</h3>
<p>Development of new features starting from the 'develop' branch.</p> <p>Разработка новых фич начинается из ветки "develop".</p>
<p>Start developing a new feature with</p> <p>Для начала разработки фичи выполните:</p>
<blockquote> <blockquote>
git flow feature start MYFEATURE git flow feature start MYFEATURE
</blockquote> </blockquote>
<p>This action creates a new feature branch based on 'develop' and switches to it</p> <p>Это действие создаёт новую ветку фичи, основанную на ветке "develop", и переключается на неё.</p>
<!-- <!--
- Bump the version number now! - Bump the version number now!
@ -194,16 +201,16 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish up a feature</h3> <h3>Завершение фичи</h3>
<p> <p>
Finish the development of a feature. Окончание разработки фичи.
This action performs the following Это действие выполняется так:
</p> </p>
<ul> <ul>
<li>Merged MYFEATURE into 'develop'</li> <li>Слияние ветки MYFEATURE в "develop"</li>
<li>Removes the feature branch</li> <li>Удаление ветки фичи</li>
<li>Switches back to 'develop' branch</li> <li>Переключение обратно на ветку "develop"</li>
</ul> </ul>
<blockquote> <blockquote>
@ -217,11 +224,11 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Publish a feature</h3> <h3>Публикация фичи</h3>
<p> <p>
Are you developing a feature in collaboration? <br/> Вы разрабатываете фичу совместно с коллегами? <br/>
Publish a feature to the remote server so it can be used by other users. Опубликуйте фичу на удалённом сервере, чтобы её могли использовать другие пользователи.
</p> </p>
<blockquote> <blockquote>
@ -235,17 +242,17 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Getting a published feature</h3> <h3>Получение опубликованной фичи</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>You can track a feature on origin by using <code> git flow feature track MYFEATURE</code> </p> <p>Вы можете отслеживать фичу в репозитории origin с помощью команды <code> git flow feature track MYFEATURE</code></p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
@ -254,29 +261,31 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="release" href="#release">Make a release</a></h2> <h2><a name="release" href="#release">Создание релиза</a></h2>
<ul> <ul>
<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> <li>Позволяет устранять мелкие баги и подготавливать различные метаданные для релиза</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Start a release</h3> <h3>Начало релиза</h3>
<p>To start a release, use the git flow release command. It creates a release branch created from the 'develop' branch.</p> <p>Для начала работы над релизом используйте команду <code>git flow release</code>
Она создаёт ветку релиза, ответляя от ветки "develop".
</p>
<blockquote> <blockquote>
git flow release start RELEASE [BASE] git flow release start RELEASE [BASE]
</blockquote> </blockquote>
<p>You can optionally supply a <code>[BASE]</code> commit sha-1 hash to start the release from. The commit must <p>При желании вы можете указать <code>[BASE]</code>-коммит в виде его хеша sha-1, чтобы начать релиз с него.
be on the Этот коммит должен принадлежать ветке "develop".</p>
'develop' branch.</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>It's wise to publish the release branch after creating it to allow release commits by other developers. Do it similar to feature publishing with the command:</p> <p>Желательно сразу публиковать ветку релиза после создания, чтобы позволить другим разработчиками выполнять коммиты в ветку релиза.
          Это делается так же, как и при публикации фичи, с помощью команды:</p>
<blockquote> <blockquote>
git flow release publish RELEASE git flow release publish RELEASE
</blockquote> </blockquote>
<p>(You can track a remote release with the <br/><code>git flow release track RELEASE</code> command)</p> <p>Вы также можете отслеживать удалённый релиз с помощью команды <br/><code>git flow release track RELEASE</code></p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="release-start"></div> <div class="release-start"></div>
@ -285,19 +294,19 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish up a release</h3> <h3>Завершение релиза</h3>
<p>Finishing a release is one of the big steps in git branching. It performs several actions:</p> <p>Завершение релиза — один из самых больших шагов в git-ветвлени. При этом происходит несколько действий:</p>
<ul> <ul>
<li>Merges the release branch back into 'master'</li> <li>Ветка релиза сливается в ветку "master"</li>
<li>Tags the release with its name</li> <li>Релиз помечается тегом равным его имени</li>
<li>Back-merges the release into 'develop'</li> <li>Ветка релиза сливается обратно в ветку "develop"</li>
<li>Removes the release branch</li> <li>Ветка релиза удаляется</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> <p>Не забудьте отправить изменения в тегах с помощью команды <code>git push --tags</code></p>
</div> </div>
<div class="col-2"> <div class="col-2">
@ -307,22 +316,22 @@
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2> <h2><a name="hotfixes" href="#hotfixes">Исправления</a></h2>
<ul> <ul>
<li>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version <li>Исправления нужны в том случае, когда нужно незамедлительно устранить нежелательное состояние продакшн-версии продукта</li>
</li> <li>Может ответвляться от соответствующего тега на ветке "master", который отмечает выпуск продакшн-версии</li>
<li>May be branched off from the corresponding tag on the master branch that marks the production version.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>git flow hotfix start</h3> <h3>git flow hotfix start</h3>
<p>Like the other git flow commands, a hotfix is started with</p> <p>Как и в случае с другими командами git flow, работа над исправлением начинается так:</p>
<blockquote> <blockquote>
git flow hotfix start VERSION [BASENAME] git flow hotfix start VERSION [BASENAME]
</blockquote> </blockquote>
<p>The version argument hereby marks the new hotfix release name. Optionally you can specify a basename to start from.</p> <p>Аргумент VERSION определяет имя нового, исправленного релиза.</p>
<p>При желании можно указать BASENAME-коммит, от которого произойдёт ответвление.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
@ -331,9 +340,10 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish a hotfix</h3> <h3>Завершение исправления</h3>
<p>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version.</p> <p>Когда исправление готово, оно сливается обратно в ветки "develop" и "master".
Кроме того, коммит в ветке "master" помечается тегом с версией исправления.</p>
<blockquote> <blockquote>
git flow hotfix finish VERSION git flow hotfix finish VERSION
</blockquote> </blockquote>
@ -353,20 +363,17 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="commands" href="#commands">Commands</a></h2> <h2><a name="commands" href="#commands">Команды</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands"/>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Backlog</h2> <h2>Последние замечания</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Not all available commands are covered here, only the most important ones</li> <li>Здесь описаны не все доступные команды, только наиболее важные</li>
<li>You can still use git and all its commands normally as you know them, git flow is only a tooling <li>Вы можете продолжать использовать git и все его команды, как обычно, git flow — это просто набор дополнительных инструментов</li>
collection <li>Возможности "support"-веток пока в beta-версии, использовать их не рекомендуется</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>
@ -376,7 +383,7 @@
<footer> <footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Comments</a></h2> <h2><a name="comments" href="#comments">Комментарии</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>

208
index.tr_TR.html
View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns="http://www.w3.org/1999/html"> <html lang="tr" xmlns="http://www.w3.org/1999/html">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@ -33,7 +33,7 @@
<h1 id="title">git-flow cheatsheet</h1> <h1 id="title">git-flow cheatsheet</h1>
<p id="author"> <p id="author">
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a> Tasarlayan: <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a> <a 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,15 +45,15 @@
} }
}(document, "script", "twitter-wjs");</script> }(document, "script", "twitter-wjs");</script>
</p> </p>
<p id="desc">efficient branching using git-flow by <a href="http://nvie.com/">Vincent Driessen</a></p> <p id="desc"><a href="http://nvie.com/">Vincent Driessen</a>'ın verimli dallanma modeli kullanılarak tasarlanmıştır.</p>
<p id="translations">translations: <p id="translations">çeviriler:
<a href="#" class="active" title="english">English</a> - <a href="index.html" title="english">English</a> -
<a href="index.es_ES.html" title="spanish">Castellano</a> - <a href="index.es_ES.html" title="spanish">Castellano</a> -
<a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> - <a href="index.pt_BR.html" title="Brazilian Portugues">Brazilian Portugues</a> -
<a href="index.zh_TW.html" title="Traditional Chinese">繁體中文(Traditional 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.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="#" class="active" title="Turkce">Türkçe</a> -
<a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> - <a href="index.ko_KR.html" title="한국어">한국어(Korean)</a> -
<a href="index.fr_FR.html" title="Français">Français</a> - <a href="index.fr_FR.html" title="Français">Français</a> -
<a href="index.it_IT.html" title="Italiano">Italiano</a> - <a href="index.it_IT.html" title="Italiano">Italiano</a> -
@ -68,38 +68,42 @@
<div class="scrollblock"> <div class="scrollblock">
<h2>About</h2> <h2>Hakkında</h2>
<p> <p>
git-flow are a set of git extensions to provide high-level repository operations for Vincent git-flow, Vincent Driessen'in dallanma modeli için geliştirilmiş, git repoları için üst düzey işlemler
Driessen's branching model. yapabilmenizi sağlayan, sözkonusu dallanma modelini kullanmayı oldukça kolaylaştıran git eklentilerini içerir.
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">more</a></small> <small><a href="http://nvie.com/posts/a-successful-git-branching-model/"><br>Vincent Driessen'in dallanma modeli hakkında</a></small>
</p> </p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>This cheatsheet shows the basic usage and effect of git-flow operations</p> <p>Bu döküman git flow işlemleri hakkında temel kullanım şekillerini içermektedir.</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Basic tips</h2> <h2>Temel Ipuçları</h2>
<ul> <ul>
<li>Git flow provides excellent command line help and output. Read it carefully to see what's happening...</li> <li>Git flow komut satırları ile kusursuz yardım (help) ve çıktı (output) sağlar.</li>
<li>The OSX/Windows Client <a href="http://www.sourcetreeapp.com/">Sourcetree</a> is an excellent git gui and provides <li>OSX ve Windows kullanıcıları için <a href="http://www.sourcetreeapp.com/">Sourcetree</a> , git flowa destek
git-flow support veren mükemmel bir git gui aracıdır.
</li> </li>
<li>Git-flow is a merge based solution. It doesn't rebase feature branches.</li> <li>Git flow birleşme-kaynaşma (merge) tabanlı bir çözümdür. Rebase tabanlı çözümlemelerle karıştırılmamalıdır. Merge tabanlı çözümlerde
merge işlemi sonucunda bütün değişiklikler kendi dallanmalarındaki commit ile tek bir dala (branch) bağlanır, başlangıç noktası sabittir.
Rebase tabanlı çözümlerde ise kendi dalınız (branch) üzerinde yaptığınız değişiklikler, son yapılan commitler
başlangıç noktası alınarak ana dal üzerine eklenir. </li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="setup" href="#setup">Setup</a></h2> <h2><a name="setup" href="#setup">Ayarlar</a></h2>
<ul> <ul>
<li>You need a working git installation as prerequisite.</li> <li>Git flow'u kullanabilmek için öncelikli olarak git kurulumunun yapılması gerekmektedir.</li>
<li>Git flow works on OSX, Linux and Windows</li> <li>Git flow OSX, Linux ve Windows üzerinde çalıştırılabilir.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
@ -121,11 +125,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>You need wget and util-linux to install git-flow.</p> <p>Git flow kurulumu için wget ve util-linux gerekmektedir.</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<p> <p>
For detailed git flow intallation instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow Git-flow kurulumu hakkında detaylı bilgi için git flow wiki'yi
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"/>
@ -133,19 +138,22 @@
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="getting_started" href="#getting_started">Getting started</a></h2> <h2><a name="getting_started" href="#getting_started">Baslarken</a></h2>
<p>Git flow needs to be initialized in order to customize your project setup.</p> <p>Git flow, kullanmak istediğiniz projede ayarlarınızı özelleştirmek amacıyla başlatılır (initialize).</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Initialize</h3> <h3>Başlangıç (Initialize)</h3>
<p>Start using git-flow by initializing it inside an existing git repository:</p> <p>git flow'u kullanmak istediğiniz reponuzdayken;
</p>
<blockquote> <blockquote>
git flow init git flow init
</blockquote> </blockquote>
<p>komutuyla başlatabilirsiniz.
</p>
<p> <p>
You'll have to answer a few questions regarding the naming conventions for your branches.<br/> Bu noktada kafanızda dallarınızı (branches) isimlendirme konusuna ilişkin birçok soru işareti oluşacaktır.
It's recommended to use the default values. Bu bağlamda varsayılan (default) değerleri kullanmanız önerilir.
</p> </p>
</div> </div>
@ -159,22 +167,26 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="features" href="#features">Features</a></h2> <h2><a name="features" href="#features">Özellikler (Features)</a></h2>
<ul class="narrow"> <ul class="narrow">
<li>Develop new features for upcoming releases</li> <li>Git flow ile yayınlamak üzere olduğunuz projenize ekleyeceğiniz özellikler için yeni dallarda (feature) kodlama yaparsınız.</li>
<li>Typically exist in developers repos only</li> <li>Genel olarak sadece geliştirici repolarında bulunurlar.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Start a new feature</h3> <h3>Yeni bir özellik eklemesi başlatmak </h3>
<p>Development of new features starting from the 'develop' branch.</p> <h3>(feature start)</h3>
<p>Start developing a new feature with</p> <p>Yeni özelliklerin eklenmesi öncelikle develop dalından (branch) başlar.</p>
<p>Yeni bir özelliği kodlamaya </p>
<blockquote> <blockquote>
git flow feature start MYFEATURE git flow feature start MYFEATURE
</blockquote> </blockquote>
<p>This action creates a new feature branch based on 'develop' and switches to it</p> <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!
@ -194,21 +206,23 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish up a feature</h3> <h3>Bir özellik eklemesi bitirilirken (feature finish)</h3>
<p> <p>
Finish the development of a feature. Bir özelliğin eklenme işlemi bitirilirken şunları yapılır:
This action performs the following
</p> </p>
<ul> <ul>
<li>Merged MYFEATURE into 'develop'</li> <li>Kendi çalıştığımız özellik dalı (burada MYFEATURE) develop ana dalı ile birleştirilir.</li>
<li>Removes the feature branch</li> <li>Bu birleşmeden sonra kendi özellik dalımız (MYFEATURE) silinir.</li>
<li>Switches back to 'develop' branch</li> <li>Bulunduğumuz dal tekrar develop olarak değiştirilir.</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>
@ -217,16 +231,22 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Publish a feature</h3> <h3>Bir özelliği yayınlamak</h3>
<h3> (Publish a feature)</h3>
<p> <p>
Are you developing a feature in collaboration? <br/> Bir ekip içerisinde geliştirme mi yapıyorsunuz ? <br/>
Publish a feature to the remote server so it can be used by other users. O zaman geliştirdiğiniz özelliği bir uzak sunucuya gönderin,
böylelikle geliştirdiğiniz özellik diğer kullanıcılar tarafından kullanılabilir.Öyleyse ;
</p> </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>
@ -235,17 +255,19 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Getting a published feature</h3> <h3>Yayınlanmış bir özelliği almak (Getting a published feature)</h3>
<p> <p>
Get a feature published by another user. Uzak sunucu üzerinde yayınlanmış bir özelliği kendi yerel (local) çalışma ortamınıza aktarırken:
</p> </p>
<blockquote> <blockquote>
git flow feature pull origin MYFEATURE git flow feature pull MYFEATURE
</blockquote> </blockquote>
<p>
<p>You can track a feature on origin by using <code> git flow feature track MYFEATURE</code> </p> size yardımcı olacaktır.
</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="feature-pull"></div> <div class="feature-pull"></div>
@ -254,29 +276,38 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="release" href="#release">Make a release</a></h2> <h2><a name="release" href="#release">Bir yayın çıkarırken (release)</a></h2>
<ul> <ul>
<li>Support preparation of a new production release</li> <li>Yeni bir ürünün yayınlanmasına yardımcı olur.</li>
<li>Allow for minor bug fixes and preparing meta-data for a release</li> <li>Küçük hata giderimleri ve meta-data hazırlığı için kullanılabilir.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>Start a release</h3> <h3>Bir sürüm yayınlamak</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>You can optionally supply a <code>[BASE]</code> commit sha-1 hash to start the release from. The commit must <p>
be on the komutu kullanılır.Bu komut ile develop dalını temel kabul eden bir release dalı (branch) yaratılır.
'develop' branch.</p> </p>
<p>Opsiyonel olarak yayınınızın <code>[BASE]</code> noktasından başlamasını sağlayabilirsiniz.
Bu commit develop dalında (branch) iken yapılmalıdır.</p>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<p>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>Yayınlama dalınız (release branch) oluştuktan sonra bu yöntem ile diğer yazılımcılar tarafından yapılan release
commitlerinin de kabul edilmesini sağlayabilirsiniz. Bunu özellik yayınlama (feature publishing) ile kolaylıkla yapabilirsiniz.
</p>
<blockquote> <blockquote>
git flow release publish RELEASE git flow release publish RELEASE
</blockquote> </blockquote>
<p>(You can track a remote release with the <br/><code>git flow release track RELEASE</code> command)</p> <p>(Uzak sunucu üzerindeki yayınları <br/>
<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>
@ -285,20 +316,25 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish up a release</h3> <h3>Bir sürüm yayınını tamamlamak</h3>
<h3>(Finish up a release)</h3>
<p>Finishing a release is one of the big steps in git branching. It performs several actions:</p> <p>
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>Merges the release branch back into 'master'</li> <li>Yayınlama yaptığımız dal olan release dalı (branch) master ana dalı ile birleştirilir.</li>
<li>Tags the release with its name</li> <li>Etiketler (tags) isimleri ile birlikte yayınlanır.</li>
<li>Back-merges the release into 'develop'</li> <li>Arkaplandaki birleştirmeler (back-merges) develop dalında yayınlanır.</li>
<li>Removes the release branch</li> <li>Yayınlama için açmış olduğumuz dal (branch) silinir.</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> <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>
@ -307,22 +343,27 @@
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2> <h2><a name="hotfixes" href="#hotfixes">Hata giderimleri (Hotfixes)</a></h2>
<ul> <ul>
<li>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version <li>Yayına çıkarılmış bir versiyonda istenmeyen durumlar ortaya çıktığında ani hata giderimi için kullanılır.
</li> </li>
<li>May be branched off from the corresponding tag on the master branch that marks the production version.</li> <li>Hotfixler, master ana dalı (branch)ındaki versiyon numarasını belirten etiketten dallanır (branching).</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<div class="col-1"> <div class="col-1">
<h3>git flow hotfix start</h3> <h3>Bir hata giderimini başlatmak</h3>
<h3> (git flow hotfix start)</h3>
<p>Like the other git flow commands, a hotfix is started with</p> <p>Diğer git flow komutlarında olduğu gibi bir hotfix başlatılırken :</p>
<blockquote> <blockquote>
git flow hotfix start VERSION [BASENAME] git flow hotfix start VERSION [BASENAME]
</blockquote> </blockquote>
<p>The version argument hereby marks the new hotfix release name. Optionally you can specify a basename to start from.</p> <p>
komutu kullanılır.
Versiyon argümanları yeni hotfix yayınının adını alır. Opsiyonel olarak
başlangıç noktası için bir isim özelleştirmesi yapabilirsiniz (basename).</p>
</div> </div>
<div class="col-2"> <div class="col-2">
<div class="hotfix-start"></div> <div class="hotfix-start"></div>
@ -331,9 +372,11 @@
<div class="scrollblock"> <div class="scrollblock">
<div class="col-1"> <div class="col-1">
<h3>Finish a hotfix</h3> <h3>Hata giderimi bitirme</h3>
<h3>(Finish a hotfix)</h3>
<p>By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version.</p> <p>Bir hata giderimi tamamlanırken, develop ve master dalları ile birleştirilir.
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>
@ -353,20 +396,21 @@
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="commands" href="#commands">Commands</a></h2> <h2><a name="commands" href="#commands">Komutlar (Commands)</a></h2>
<img src="img/git-flow-commands.png" alt="git-flow commands"/> <img src="img/git-flow-commands.png" alt="git-flow commands"/>
</div> </div>
<div class="scrollblock"> <div class="scrollblock">
<h2>Backlog</h2> <h2>Içerik bilgisi (Backlog)</h2>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
<ul> <ul>
<li>Not all available commands are covered here, only the most important ones</li> <li>Bu dökümanda Git flow için en önemli komutlar ve kullanımları ile ilgili bilgiler verilmektedir.
<li>You can still use git and all its commands normally as you know them, git flow is only a tooling Ancak tüm Git flow komutları burda bahsedilenlerle sınırlı değildir.</li>
collection <li>Git flow kullanırken git ve gite ait diğer alt komutları gönlünüzce kullanabilirsiniz.
Git flow sadece bir repo derleme-toplama aracıdır.
</li> </li>
<li>The 'support' feature is still beta, using it is not advised</li> <li>Support branch hala beta sürümündedir.Kullanımı tavsiye edilmemektedir.</li>
<li>If you'd like to supply translations I'd be happy to integrate them</li> <li>Çevirilerinizle bize destek olabilirsiniz.Bunları projemize eklemekten mutluluk duyarız.</li>
</ul> </ul>
<p class="divider">&#9733; &#9733; &#9733;</p> <p class="divider">&#9733; &#9733; &#9733;</p>
</div> </div>
@ -376,7 +420,7 @@
<footer> <footer>
<div class="scrollblock"> <div class="scrollblock">
<h2><a name="comments" href="#comments">Comments</a></h2> <h2><a name="comments" href="#comments">Yorumlar (Comments)</a></h2>
<div id="disqus_thread"></div> <div id="disqus_thread"></div>
</div> </div>