From f6a528f3e6f07e69d34f3bacca85d85ec9cd3620 Mon Sep 17 00:00:00 2001 From: pwl Date: Wed, 10 Feb 2016 22:10:36 +0100 Subject: [PATCH 1/6] Improved .gitignore file --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 62c8935..bf7a532 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -.idea/ \ No newline at end of file +.idea/ +# Text editor backup files +*~ From f7fdfe9309f788b443ae8ba903efaac305fcc6fc Mon Sep 17 00:00:00 2001 From: pwl Date: Wed, 10 Feb 2016 22:11:25 +0100 Subject: [PATCH 2/6] Added polish language view --- index.ca_CA.html | 3 +- index.de_DE.html | 3 +- index.el_GR.html | 3 +- index.es_ES.html | 3 +- index.fr_FR.html | 3 +- index.html | 3 +- index.it_IT.html | 3 +- index.ja_JP.html | 3 +- index.ko_KR.html | 3 +- index.nl_NL.html | 3 +- index.pl_PL.html | 409 +++++++++++++++++++++++++++++++++++++++++++++++ index.pt_BR.html | 3 +- index.ro_RO.html | 3 +- index.ru_RU.html | 3 +- index.tr_TR.html | 3 +- index.uk_UK.html | 3 +- index.vi_VN.html | 3 +- index.zh_CN.html | 3 +- index.zh_TW.html | 3 +- 19 files changed, 445 insertions(+), 18 deletions(-) create mode 100644 index.pl_PL.html diff --git a/index.ca_CA.html b/index.ca_CA.html index 46fca4d..c52ea15 100644 --- a/index.ca_CA.html +++ b/index.ca_CA.html @@ -65,7 +65,8 @@ Română (Romanian) - Ελληνικά (Greek) - Українська (Ukrainian) - - Tiếng Việt (Vietnamese) + Tiếng Việt (Vietnamese) - + Polski

diff --git a/index.de_DE.html b/index.de_DE.html index ee83396..b35ba32 100644 --- a/index.de_DE.html +++ b/index.de_DE.html @@ -64,7 +64,8 @@ Română (Romanian) - Ελληνικά (Greek) - Українська (Ukrainian) - - Tiếng Việt (Vietnamese) + Tiếng Việt (Vietnamese) - + Polski

diff --git a/index.el_GR.html b/index.el_GR.html index b2eea47..f9a28cc 100644 --- a/index.el_GR.html +++ b/index.el_GR.html @@ -68,7 +68,8 @@ Română (Romanian) - Ελληνικά (Greek) - Українська (Ukrainian) - - Tiếng Việt (Vietnamese) + Tiếng Việt (Vietnamese) - + Polski

diff --git a/index.es_ES.html b/index.es_ES.html index b5a1576..f25e73b 100644 --- a/index.es_ES.html +++ b/index.es_ES.html @@ -63,7 +63,8 @@ Română (Romanian) - Ελληνικά (Greek) - Українська (Ukrainian) - - Tiếng Việt (Vietnamese) + Tiếng Việt (Vietnamese) - + Polski

diff --git a/index.fr_FR.html b/index.fr_FR.html index 5d2d793..c18ec25 100644 --- a/index.fr_FR.html +++ b/index.fr_FR.html @@ -64,7 +64,8 @@ Română (Romanian) - Ελληνικά (Greek) - Українська (Ukrainian) - - Tiếng Việt (Vietnamese) + Tiếng Việt (Vietnamese) - + Polski

diff --git a/index.html b/index.html index 41ebfda..4ede3c3 100644 --- a/index.html +++ b/index.html @@ -64,7 +64,8 @@ Română (Romanian) - Ελληνικά (Greek) - Українська (Ukrainian) - - Tiếng Việt (Vietnamese) + Tiếng Việt (Vietnamese) - + Polski

diff --git a/index.it_IT.html b/index.it_IT.html index 151087f..eb59c2a 100644 --- a/index.it_IT.html +++ b/index.it_IT.html @@ -63,7 +63,8 @@ Català (Catalan) - Română (Romanian) - Ελληνικά (Greek) - - Tiếng Việt (Vietnamese) + Tiếng Việt (Vietnamese) - + Polski

diff --git a/index.ja_JP.html b/index.ja_JP.html index 2bde4b6..a145bc3 100644 --- a/index.ja_JP.html +++ b/index.ja_JP.html @@ -64,7 +64,8 @@ Română (Romanian) - Ελληνικά (Greek) - Українська (Ukrainian) - - Tiếng Việt (Vietnamese) + Tiếng Việt (Vietnamese) - + Polski

diff --git a/index.ko_KR.html b/index.ko_KR.html index fe7578f..a5fd286 100644 --- a/index.ko_KR.html +++ b/index.ko_KR.html @@ -64,7 +64,8 @@ Română (Romanian) - Ελληνικά (Greek) - Українська (Ukrainian) - - Tiếng Việt (Vietnamese) + Tiếng Việt (Vietnamese) - + Polski

diff --git a/index.nl_NL.html b/index.nl_NL.html index c50c52d..0917156 100644 --- a/index.nl_NL.html +++ b/index.nl_NL.html @@ -63,7 +63,8 @@ Română (Romanian) - Ελληνικά (Greek) - Українська (Ukrainian) - - Tiếng Việt (Vietnamese) + Tiếng Việt (Vietnamese) - + Polski

diff --git a/index.pl_PL.html b/index.pl_PL.html new file mode 100644 index 0000000..280c2df --- /dev/null +++ b/index.pl_PL.html @@ -0,0 +1,409 @@ + + + + + + git-flow cheatsheet + + + + + + + + + + + +
+ +

git-flow cheatsheet

+ +

+ created by Daniel Kummer + + +

+

efficient branching using git-flow by Vincent Driessen

+

translations: + English - + Castellano - + Brazilian Portugues - + 繁體中文(Traditional Chinese) - + 简体中文(Simplified Chinese) - + 日本語 - + Türkçe - + 한국어(Korean) - + Français - + Italiano - + Nederlands - + Русский (Russian) - + Deutsch (German) - + Català (Catalan) - + Română (Romanian) - + Ελληνικά (Greek) - + Українська (Ukrainian) - + Tiếng Việt (Vietnamese) - + Polski +

+
+ +
+ + +
+

About

+ +

+ git-flow are a set of git extensions to provide high-level repository operations for Vincent + Driessen's branching model. + more +

+

★ ★ ★

+ +

This cheatsheet shows the basic usage and effect of git-flow operations

+ +

★ ★ ★

+
+ +
+

Basic tips

+
    +
  • Git flow provides excellent command line help and output. Read it carefully to see what's happening...
    • +
  • The OSX/Windows Client Sourcetree is an excellent git gui and provides + git-flow support +
    • +
  • Git-flow is a merge based solution. It doesn't rebase feature branches.
    • +
+

★ ★ ★

+
+ + +
+

Setup

+
    +
  • You need a working git installation as prerequisite.
    • +
  • Git flow works on OSX, Linux and Windows
    • +
+

★ ★ ★

+
+

OSX

+ Homebrew +
+ $ brew install git-flow +
+ Macports +
+ $ port install git-flow +
+

Linux

+
+ $ apt-get install git-flow +
+

Windows (Cygwin)

+
+ $ wget -q -O - --no-check-certificate + https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | bash +
+

You need wget and util-linux to install git-flow.

+
+
+

+ For detailed git flow installation instructions please visit the git flow + wiki. +

+ install git-flow +
+
+ +
+

Getting started

+

Git flow needs to be initialized in order to customize your project setup.

+

★ ★ ★

+
+

Initialize

+ +

Start using git-flow by initializing it inside an existing git repository:

+
+ git flow init +
+

+ You'll have to answer a few questions regarding the naming conventions for your branches.
+ It's recommended to use the default values. +

+ +
+
+
+
+
+
+
+
+ + +
+

Features

+ +
    +
  • Develop new features for upcoming releases
    • +
  • Typically exist in developers repos only
    • +
+

★ ★ ★

+ +
+

Start a new feature

+

Development of new features starting from the 'develop' branch.

+

Start developing a new feature with

+
+ git flow feature start MYFEATURE +
+

This action creates a new feature branch based on 'develop' and switches to it

+ + +
+
+
+
+
+ +
+
+

Finish up a feature

+ +

+ Finish the development of a feature. + This action performs the following +

+
    +
  • Merged MYFEATURE into 'develop'
    • +
  • Removes the feature branch
    • +
  • Switches back to 'develop' branch
    • +
+ +
+ git flow feature finish MYFEATURE +
+
+
+
+
+
+ +
+
+

Publish a feature

+ +

+ Are you developing a feature in collaboration?
+ Publish a feature to the remote server so it can be used by other users. +

+ +
+ git flow feature publish MYFEATURE +
+
+
+
+
+
+ +
+
+

Getting a published feature

+ +

+ Get a feature published by another user. +

+ +
+ git flow feature pull origin MYFEATURE +
+ +

You can track a feature on origin by using git flow feature track MYFEATURE

+
+
+
+
+
+ + +
+

Make a release

+ +
    +
  • Support preparation of a new production release
    • +
  • Allow for minor bug fixes and preparing meta-data for a release
    • +
+

★ ★ ★

+
+

Start a release

+ +

To start a release, use the git flow release command. It creates a release branch created from the 'develop' branch.

+
+ git flow release start RELEASE [BASE] +
+

You can optionally supply a [BASE] commit sha-1 hash to start the release from. The commit must + be on the + 'develop' branch.

+

★ ★ ★

+

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:

+
+ git flow release publish RELEASE +
+

(You can track a remote release with the
git flow release track RELEASE command)

+
+
+
+
+
+ +
+
+

Finish up a release

+ +

Finishing a release is one of the big steps in git branching. It performs several actions:

+
    +
  • Merges the release branch back into 'master'
    • +
  • Tags the release with its name
    • +
  • Back-merges the release into 'develop'
    • +
  • Removes the release branch
    • +
+
+ git flow release finish RELEASE +
+

Don't forget to push your tags withgit push --tags

+ +
+
+
+ +
+
+ +
+

Hotfixes

+ +
    +
  • Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version +
    • +
  • May be branched off from the corresponding tag on the master branch that marks the production version.
    • +
+

★ ★ ★

+
+

git flow hotfix start

+ +

Like the other git flow commands, a hotfix is started with

+
+ git flow hotfix start VERSION [BASENAME] +
+

The version argument hereby marks the new hotfix release name. Optionally you can specify a basename to start from.

+
+
+
+
+
+ +
+
+

Finish a hotfix

+ +

By finishing a hotfix it gets merged back into develop and master. Additionally the master merge is tagged with the hotfix version.

+
+ git flow hotfix finish VERSION +
+
+
+
+
+
+ +
+
+
+
+
+
+
+ + +
+

Commands

+ git-flow commands +
+ +
+

Backlog

+

★ ★ ★

+
    +
  • Not all available commands are covered here, only the most important ones
    • +
  • You can still use git and all its commands normally as you know them, git flow is only a tooling + collection +
    • +
  • The 'support' feature is still beta, using it is not advised
    • +
  • If you'd like to supply translations I'd be happy to integrate them
    • +
+

★ ★ ★

+
+
+ + + + + + + +comments powered by Disqus + + + + diff --git a/index.pt_BR.html b/index.pt_BR.html index e2da81c..6efc7e4 100644 --- a/index.pt_BR.html +++ b/index.pt_BR.html @@ -47,7 +47,8 @@ Română (Romanian) - Ελληνικά (Greek) - Українська (Ukrainian) - - Tiếng Việt (Vietnamese) + Tiếng Việt (Vietnamese) - + Polski

diff --git a/index.ro_RO.html b/index.ro_RO.html index ca6fbe0..24ecfda 100644 --- a/index.ro_RO.html +++ b/index.ro_RO.html @@ -64,7 +64,8 @@ Română (Romanian) - Ελληνικά (Greek) - Українська (Ukrainian) - - Tiếng Việt (Vietnamese) + Tiếng Việt (Vietnamese) - + Polski

diff --git a/index.ru_RU.html b/index.ru_RU.html index 0f57767..c2286b2 100644 --- a/index.ru_RU.html +++ b/index.ru_RU.html @@ -72,7 +72,8 @@ Română (Romanian) - Ελληνικά (Greek) - Українська (Ukrainian) - - Tiếng Việt (Vietnamese) + Tiếng Việt (Vietnamese) - + Polski

diff --git a/index.tr_TR.html b/index.tr_TR.html index b9a3e3e..b05f87d 100644 --- a/index.tr_TR.html +++ b/index.tr_TR.html @@ -64,7 +64,8 @@ Română (Romanian) - Ελληνικά (Greek) - Українська (Ukrainian) - - Tiếng Việt (Vietnamese) + Tiếng Việt (Vietnamese) - + Polski

diff --git a/index.uk_UK.html b/index.uk_UK.html index 61cf45b..20ed3dd 100644 --- a/index.uk_UK.html +++ b/index.uk_UK.html @@ -72,7 +72,8 @@ Română (Romanian) - Ελληνικά (Greek) - Українська (Ukrainian) - - Tiếng Việt (Vietnamese) + Tiếng Việt (Vietnamese) - + Polski

diff --git a/index.vi_VN.html b/index.vi_VN.html index d08e411..88cd25b 100644 --- a/index.vi_VN.html +++ b/index.vi_VN.html @@ -64,7 +64,8 @@ Română (Romanian) - Ελληνικά (Greek) - Українська (Ukrainian) - - Tiếng Việt (Vietnamese) + Tiếng Việt (Vietnamese) - + Polski

diff --git a/index.zh_CN.html b/index.zh_CN.html index 6416dc0..6bdfc7f 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -51,7 +51,8 @@ Română (Romanian) - Ελληνικά (Greek) - Українська (Ukrainian) - - Tiếng Việt (Vietnamese) + Tiếng Việt (Vietnamese) - + Polski

diff --git a/index.zh_TW.html b/index.zh_TW.html index 76b1d73..bb92344 100644 --- a/index.zh_TW.html +++ b/index.zh_TW.html @@ -54,7 +54,8 @@ Română (Romanian) - Ελληνικά (Greek) - Українська (Ukrainian) - - Tiếng Việt (Vietnamese) + Tiếng Việt (Vietnamese) - + Polski

From 3c60b339b96c80d1dbb97a33994c352418f073df Mon Sep 17 00:00:00 2001 From: pwl Date: Wed, 10 Feb 2016 23:42:11 +0100 Subject: [PATCH 3/6] Translation to polish, round 1 --- index.pl_PL.html | 98 ++++++++++++++++++++++++------------------------ 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/index.pl_PL.html b/index.pl_PL.html index 280c2df..f8a5fbf 100644 --- a/index.pl_PL.html +++ b/index.pl_PL.html @@ -1,9 +1,9 @@ - + - git-flow cheatsheet + ściągawka do git-flow @@ -30,10 +30,10 @@
-

git-flow cheatsheet

+

ściągawka do git-flow

- created by Daniel Kummer + Autor: Daniel Kummer

-

efficient branching using git-flow by Vincent Driessen

-

translations: - English - +

sprawne rozgałęzianie z git-flow od Vincenta Driessen'a

+

tłumaczenia: + English - Castellano - Brazilian Portugues - 繁體中文(Traditional Chinese) - @@ -65,7 +65,7 @@ Ελληνικά (Greek) - Українська (Ukrainian) - Tiếng Việt (Vietnamese) - - Polski + Polski

@@ -73,38 +73,38 @@
-

About

+

Wprowadzenie

- git-flow are a set of git extensions to provide high-level repository operations for Vincent - Driessen's branching model. - more + git-flow jest zbiorem rozszerzeń git dostarczającym wysokopoziomowe operacje na repozytorium, wspierającym strategię + rozkałęziania opracowaną przez Vincenta Driessen'a. + Czytaj więcej

★ ★ ★

-

This cheatsheet shows the basic usage and effect of git-flow operations

+

Ta ściągawka prezentuje podstawy użycia operacji git-flow.

★ ★ ★

-

Basic tips

+

Podstawowe wskazówki

    -
  • Git flow provides excellent command line help and output. Read it carefully to see what's happening...
    • -
  • The OSX/Windows Client Sourcetree is an excellent git gui and provides - git-flow support +
  • Git flow dostarcza świetną pomoc z poziomu wiersza poleceń. Przeczytaj uważne, aby dostrzec co się wydarzy...
    • +
  • Sourcetree - klient dla OSX/Windows jest wyśmienitą nakładką graficzną dla git + wspierającą również git-flow.
    • -
  • Git-flow is a merge based solution. It doesn't rebase feature branches.
    • +
  • Git-flow bazuje na scalaniu. Nie używa zmiany bazy do integorwania zmian.

★ ★ ★

-

Setup

+

Konfiguracja

    -
  • You need a working git installation as prerequisite.
    • -
  • Git flow works on OSX, Linux and Windows
    • +
  • Zanim zaczniesz potrzebujesz działającej instalacji git.
    • +
  • Git flow działa na systemach OSX, Linux oraz Windows

★ ★ ★

@@ -126,11 +126,11 @@ $ wget -q -O - --no-check-certificate https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | bash -

You need wget and util-linux to install git-flow.

+

Potrzebujesz wget oraz util-linux żeby zainstalować git-flow.

- For detailed git flow installation instructions please visit the git flow + Szczegółową instrukcję instalacji git możesz znaleźć na git flow wiki.

install git-flow @@ -138,19 +138,19 @@
-

Getting started

-

Git flow needs to be initialized in order to customize your project setup.

+

Pierwsze kroki

+

Żeby dostować ustawienia Twojego projektu Git flow musi zostać zainicjalizowany.

★ ★ ★

-

Initialize

+

Inicjalizacja

-

Start using git-flow by initializing it inside an existing git repository:

+

Rozpocznij używanie git-flow inicjalizując go w istniejącym repozytorium git:

git flow init

- You'll have to answer a few questions regarding the naming conventions for your branches.
- It's recommended to use the default values. + Będziesz musiał odpowiedzieć na kilka pytań dotyczących nazewnictwa gałęzi.
+ Zaleca się stosowanie wartości domyślnych.

@@ -164,22 +164,22 @@
-

Features

+

Funkcjonalności

    -
  • Develop new features for upcoming releases
    • -
  • Typically exist in developers repos only
    • +
  • Rozwój nowych funkcjonalności przyszłych wydań.
    • +
  • Zazwyczaj istnieją tylko w repozytoriach deweloperów.

★ ★ ★

-

Start a new feature

-

Development of new features starting from the 'develop' branch.

-

Start developing a new feature with

+

Rozpocznij nową funkcjonalność

+

Rozwój nowej funkcjonalności rozpoczyna się od gałęzi 'develop'.

+

Rozpocznij rozwój nowej funkcjonalności używając:

git flow feature start MYFEATURE
-

This action creates a new feature branch based on 'develop' and switches to it

+

W ten sposób tworzysz gałąź dla nowej funkcjonalności bazując na gałęzi 'develop' jednocześnie się na nią przełączając.