add zh_TW translation link

This commit is contained in:
tonypai 2014-12-31 12:42:20 +08:00
parent bfd37275fa
commit 87e9820b8f

View File

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