mirror of
https://github.com/danielkummer/git-flow-cheatsheet.git
synced 2025-04-29 13:34:23 +02:00
add zh_TW translation link
This commit is contained in:
tonypai
parent
54616460f2
commit
703225bdb0
192
index.de_DE.html
192
index.de_DE.html
@ -30,10 +30,10 @@
|
||||
<div id="banner"><a href="https://github.com/danielkummer/git-flow-cheatsheet">Fork me on GitHub</a></div>
|
||||
<header>
|
||||
|
||||
<h1 id="title">git-flow Spickzettel</h1>
|
||||
<h1 id="title">git-flow cheatsheet</h1>
|
||||
|
||||
<p id="author">
|
||||
erstellt von <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
created by <a href="http://twitter.com/0r1g4m14dd1c7">Daniel Kummer</a>
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-via="0r1g4m14dd1c7" data-size="large">Tweet</a>
|
||||
<script>!function (d, s, id) {
|
||||
var js, fjs = d.getElementsByTagName(s)[0];
|
||||
@ -45,11 +45,12 @@
|
||||
}
|
||||
}(document, "script", "twitter-wjs");</script>
|
||||
</p>
|
||||
<p id="desc">Effizientes Branching mittels git-flow von <a href="http://nvie.com/">Vincent Driessen</a></p>
|
||||
<p id="translations">Übersetzungen:
|
||||
<a href="index.html" title="English">English</a> -
|
||||
<a href="index.es_ES.html" title="Spanish">Castellano</a> -
|
||||
<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> -
|
||||
@ -58,7 +59,7 @@
|
||||
<a href="index.it_IT.html" title="Italiano">Italiano</a> -
|
||||
<a href="index.nl_NL.html" title="Nederlands">Nederlands</a> -
|
||||
<a href="index.ru_RU.html" title="Russian">Русский (Russian)</a> -
|
||||
<a href="#" class="active" title="German">Deutsch (German)</a> -
|
||||
<a href="index.de_DE.html" title="German">Deutsch (German)</a> -
|
||||
<a href="index.ca_CA.html" title="Català">Català (Catalan)</a>
|
||||
</p>
|
||||
</header>
|
||||
@ -67,36 +68,38 @@
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Über</h2>
|
||||
<h2>About</h2>
|
||||
|
||||
<p>
|
||||
git-flow ist ein Set aus Git-Erweiterungen, welches komplexe Repository-Arbeiten
|
||||
nach Vincent Driessen's Branching-Modell ermöglicht.
|
||||
<small><a href="http://nvie.com/posts/a-successful-git-branching-model/">mehr</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>Dieser Spickzettel veranschaulicht die grundlegende Nutzung und den Ablauf von git-flow Operationen.</p>
|
||||
<p>This cheatsheet shows the basic usage and effect of git-flow operations</p>
|
||||
|
||||
<p class="divider">★ ★ ★</p>
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2>Grundlegende Tipps</h2>
|
||||
<h2>Basic tips</h2>
|
||||
<ul>
|
||||
<li>git-flow bietet eine exzellente Hilfe und ausführliche Ausgabe auf der Kommandozeile. Lies dir die Ausgaben aufmerksam durch und versuche zu verstehen, was passiert.</li>
|
||||
<li>Der OSX/Windows Client <a href="http://www.sourcetreeapp.com/">SourceTree</a> bietet ein exzellentes grafisches Interface und einfache Git-Flow Unterstützung.</li>
|
||||
<li>git-flow ist eine rein Merge-basierte Lösung (Zusammenführung). Es findet kein Rebasing der Feature-Branches (Entwicklungszweige) statt.</li>
|
||||
<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 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">Einrichtung</a></h2>
|
||||
<h2><a name="setup" href="#setup">Setup</a></h2>
|
||||
<ul>
|
||||
<li>Du benötigst eine funktionierende Git Installation als Voraussetzung.</li>
|
||||
<li>git-flow läuft unter OSX, Linux und 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">
|
||||
@ -118,11 +121,11 @@
|
||||
$ wget -q -O - --no-check-certificate
|
||||
https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | bash
|
||||
</blockquote>
|
||||
<p>Du benötigst wget und util-linux um git-flow zu installieren.</p>
|
||||
<p>You need wget and util-linux to install git-flow.</p>
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<p>
|
||||
Für eine detaillierte git-flow Installationsanleitung, besuche bitte das <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow
|
||||
For detailed git flow intallation instructions please visit the <a href="https://github.com/nvie/gitflow/wiki/Windows">git flow
|
||||
wiki</a>.
|
||||
</p>
|
||||
<img src="img/download.png" alt="install git-flow"/>
|
||||
@ -130,19 +133,19 @@
|
||||
</div>
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="getting_started" href="#getting_started">Erste Schritte</a></h2>
|
||||
<p>git-flow muss initalisiert werden, um das Projektsetup anzupassen.</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>Initialisierung</h3>
|
||||
<h3>Initialize</h3>
|
||||
|
||||
<p>Fange an mit git-flow zu arbeiten, indem Du es innerhalb eines bestehenden Git-Repository initialisierst:</p>
|
||||
<p>Start using git-flow by initializing it inside an existing git repository:</p>
|
||||
<blockquote>
|
||||
git flow init
|
||||
</blockquote>
|
||||
<p>
|
||||
Dabei musst Du einige Fragen bezueglich der Namenskoventionen Deiner Branches (Entwicklungszweige) beantworten.<br/>
|
||||
Es wird empfohlen, die Standardwerte zu verwenden.
|
||||
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>
|
||||
@ -159,19 +162,19 @@
|
||||
<h2><a name="features" href="#features">Features</a></h2>
|
||||
|
||||
<ul class="narrow">
|
||||
<li>Entwicklung neuer Features für bevorstehende Releases.</li>
|
||||
<li>In der Regel nur in Entwickler-Repositories zu finden.</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>Entwicklung neuer Features</h3>
|
||||
<p>Neue Features werden vom 'develop'-Branch abgeleitet.</p>
|
||||
<p>Starte die Entwicklung eines neuen Features mittels</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 MYFEATURE
|
||||
</blockquote>
|
||||
<p>Dieser Befehl erstellt einen neuen Feature-Branch basierend auf 'develop' und wechselt in diesen.</p>
|
||||
<p>This action creates a new feature branch based on 'develop' and switches to it</p>
|
||||
|
||||
<!--
|
||||
- Bump the version number now!
|
||||
@ -191,16 +194,16 @@
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Fertigstellung eines Features</h3>
|
||||
<h3>Finish up a feature</h3>
|
||||
|
||||
<p>
|
||||
Beende die Entwicklung eines Features.
|
||||
Dies führt zu folgenden Aktionen:
|
||||
Finish the development of a feature.
|
||||
This action performs the following
|
||||
</p>
|
||||
<ul>
|
||||
<li>Zusammenführen von MYFEATURE in den 'develop'-Branch (Merge-Prozess)</li>
|
||||
<li>Entfernt den Feature-Branch</li>
|
||||
<li>Wechselt zurück in den 'develop'-Branch</li>
|
||||
<li>Merged MYFEATURE into 'develop'</li>
|
||||
<li>Removes the feature branch</li>
|
||||
<li>Switches back to 'develop' branch</li>
|
||||
</ul>
|
||||
|
||||
<blockquote>
|
||||
@ -214,12 +217,11 @@
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Veröffentlichen eines Features</h3>
|
||||
<h3>Publish a feature</h3>
|
||||
|
||||
<p>
|
||||
Entwickelst Du ein Feature in Zusammenarbeit? <br/>
|
||||
Veröffentliche Dein Feature auf einem entfernten Server,
|
||||
so dass es auch von anderen verfolgt werden kann.
|
||||
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>
|
||||
@ -233,23 +235,17 @@
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Holen eines veröffentlichten Features</h3>
|
||||
<h3>Getting a published feature</h3>
|
||||
|
||||
<p>
|
||||
Hole ein Feature, welches von einem anderen Nutzer veröffentlicht wurde.
|
||||
Get a feature published by another user.
|
||||
</p>
|
||||
|
||||
<blockquote>
|
||||
git flow feature pull origin MYFEATURE
|
||||
</blockquote>
|
||||
|
||||
<p>
|
||||
Du kannst ein Feature unter Verwendung von
|
||||
</p>
|
||||
<blockquote>git flow feature track MYFEATURE</blockquote>
|
||||
<p>
|
||||
auf 'origin' verfolgen.
|
||||
</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>
|
||||
@ -258,41 +254,29 @@
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="release" href="#release">Erstelle ein Release</a></h2>
|
||||
<h2><a name="release" href="#release">Make a release</a></h2>
|
||||
|
||||
<ul>
|
||||
<li>Unterstützt die Fertigstellung einer Produktionsversion.</li>
|
||||
<li>Erlaubt geringfügige Bugfixes und die Erstellung der Metadaten für ein Release</li>
|
||||
<li>Support preparation of a new production release</li>
|
||||
<li>Allow for minor bug fixes and preparing meta-data for a release</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>Beginne ein Release</h3>
|
||||
<h3>Start a release</h3>
|
||||
|
||||
<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>
|
||||
<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 RELEASE [BASE]
|
||||
</blockquote>
|
||||
<p>
|
||||
Du kannst optional einen <code>[BASE]</code> Commit sha-1 Hash bereitstellen,
|
||||
um ein Release von diesem Commit zu starten. Der Commit muss sich im 'develop'-Branch befinden.
|
||||
</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>
|
||||
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>
|
||||
<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 RELEASE
|
||||
</blockquote>
|
||||
<p>
|
||||
(Du kannst ein entferntes Remote-Release mittels <br/>
|
||||
<code>git flow release track RELEASE</code> verfolgen.)
|
||||
</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>
|
||||
@ -301,22 +285,19 @@
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Fertigstellung eines Releases</h3>
|
||||
<h3>Finish up a release</h3>
|
||||
|
||||
<p>
|
||||
Das Beenden eines Releases ist einer der größten Schritte im Git-Branching-Prozess.
|
||||
Es bewirkt folgende Aktionen:
|
||||
</p>
|
||||
<p>Finishing a release is one of the big steps in git branching. It performs several actions:</p>
|
||||
<ul>
|
||||
<li>Zusammenführen des Release-Branches zurück in den 'master'-Branch. (Merge-Prozess)</li>
|
||||
<li>Markiert (Tagged) das Release mit seinem Namen</li>
|
||||
<li>Zurückführen des Releases in den 'develop'-Branch (Merge-Prozess)</li>
|
||||
<li>Entfernt den Release-Branch</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 RELEASE
|
||||
</blockquote>
|
||||
<p>Vergesse nicht Deine Tags mittels <code>git push --tags</code> zu pushen.</p>
|
||||
<p>Don't forget to push your tags with<code>git push --tags</code></p>
|
||||
|
||||
</div>
|
||||
<div class="col-2">
|
||||
@ -329,28 +310,19 @@
|
||||
<h2><a name="hotfixes" href="#hotfixes">Hotfixes</a></h2>
|
||||
|
||||
<ul>
|
||||
<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>Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version
|
||||
</li>
|
||||
<li>May be branched off from the corresponding tag on the master branch that marks the production version.</li>
|
||||
</ul>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<div class="col-1">
|
||||
<h3>git flow hotfix start</h3>
|
||||
|
||||
<p>Ähnlich wie auch die anderen git-flow Befehle, wird ein Hotfix mittels</p>
|
||||
<p>Like the other git flow commands, a hotfix is started with</p>
|
||||
<blockquote>
|
||||
git flow hotfix start VERSION [BASENAME]
|
||||
</blockquote>
|
||||
<p>
|
||||
begonnen. Das VERSION-Argument markiert hierbei den neuen Hotfix-Release-Namen.
|
||||
Optional kannst Du auch einen BASENAME spezifizieren.
|
||||
</p>
|
||||
|
||||
<p>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>
|
||||
@ -359,13 +331,9 @@
|
||||
|
||||
<div class="scrollblock">
|
||||
<div class="col-1">
|
||||
<h3>Fertigstellung eines Hotfixes</h3>
|
||||
<h3>Finish a hotfix</h3>
|
||||
|
||||
<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>
|
||||
<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 VERSION
|
||||
</blockquote>
|
||||
@ -385,7 +353,7 @@
|
||||
|
||||
|
||||
<div class="scrollblock">
|
||||
<h2><a name="commands" href="#commands">Befehle</a></h2>
|
||||
<h2><a name="commands" href="#commands">Commands</a></h2>
|
||||
<img src="img/git-flow-commands.png" alt="git-flow commands"/>
|
||||
</div>
|
||||
|
||||
@ -393,10 +361,12 @@
|
||||
<h2>Backlog</h2>
|
||||
<p class="divider">★ ★ ★</p>
|
||||
<ul>
|
||||
<li>Nicht alle verfügbaren Befehle sind hier abgedeckt, nur die wichtigsten.</li>
|
||||
<li>Du kannst weiterhin alle Git-Befehle normal nutzen, wie Du es gewohnt bist. Git-flow ist nur eine Werkzeugsammlung.</li>
|
||||
<li>Das 'support' Feature ist noch Beta und die Nutzung nicht empfohlen.</li>
|
||||
<li>Wenn Du Übersetzungen beisteuern möchtest, würde ich mich freuen diese zu integrieren.</li>
|
||||
<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>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>
|
||||
@ -406,7 +376,7 @@
|
||||
|
||||
<footer>
|
||||
<div class="scrollblock">
|
||||
<h2><a name="comments" href="#comments">Kommentare</a></h2>
|
||||
<h2><a name="comments" href="#comments">Comments</a></h2>
|
||||
|
||||
<div id="disqus_thread"></div>
|
||||
</div>
|
||||
@ -425,9 +395,9 @@
|
||||
(document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
|
||||
})();
|
||||
</script>
|
||||
<noscript>Bitte aktiviere Javascript um die Kommentare zu sehen. <a href="http://disqus.com/?ref_noscript">Powered by Disqus.</a>
|
||||
<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a>
|
||||
</noscript>
|
||||
<a href="http://disqus.com" class="dsq-brlink">Kommentare powered by <span class="logo-disqus">Disqus</span></a>
|
||||
<a href="http://disqus.com" class="dsq-brlink">comments powered by <span class="logo-disqus">Disqus</span></a>
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user