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