From 180f16426b55bc98195731039136fa2048c9b79c Mon Sep 17 00:00:00 2001 From: Daniel Kummer Date: Tue, 20 Nov 2012 10:33:29 +0100 Subject: [PATCH 001/106] add anchors to h2 titles --- css/style.css | 22 ++++++++++++++++++++-- index.html | 16 ++++++++-------- index.pt_BR.html | 18 +++++++++--------- 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/css/style.css b/css/style.css index ee51e8c..aeb0f4a 100644 --- a/css/style.css +++ b/css/style.css @@ -63,6 +63,24 @@ p { color: #222438; } +h2 a { + text-decoration: none; + font-size: 60px; + font-weight: normal; + margin: 0; + margin-bottom: 25px; + text-shadow: 0 2px 1px #000; + color: #FFB000; + font-family: 'Sansita One', cursive; +} + +h2 a:hover { + text-decoration: none; +} + +h2 a:visited { + color: #FFB000; +} a, a:visited { color: #D92B00; @@ -92,7 +110,7 @@ blockquote { border-right: 2px solid #30334F; border-radius: 10px; padding: 5px 20px; - color:white; + color: white; font-family: menlo, monospace; } @@ -161,7 +179,7 @@ code { height: 52px; background: url("../img/lines-close.png"); position: relative; - left: 11px; + left: 11px; } .hotfix-end, .hotfix-start, .release-end, .release-start, .feature-end, .feature-start { diff --git a/index.html b/index.html index efd3d0f..81e369f 100644 --- a/index.html +++ b/index.html @@ -46,7 +46,7 @@ }(document, "script", "twitter-wjs");

efficient branching using git-flow by Vincent Driessen

-

translations: en - pt_BR

+

translations: en - Brazilian Portugues

@@ -80,7 +80,7 @@
-

Setup

+

Setup

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

Getting started

+

Getting started

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

★ ★ ★

@@ -137,7 +137,7 @@
-

Features

+

Features

  • Develop new features for upcoming releases
    • @@ -230,7 +230,7 @@
    -

    Make a release

    +

    Make a release

    • Support preparation of a new production release
      • @@ -283,7 +283,7 @@
    -

    Hotfixes

    +

    Hotfixes

    • Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version @@ -329,7 +329,7 @@
      -

      Commands

      +

      Commands

      git-flow commands
      @@ -352,7 +352,7 @@
      -

      Comments

      +

      Comments

      diff --git a/index.pt_BR.html b/index.pt_BR.html index e2aaaa0..212c4d1 100644 --- a/index.pt_BR.html +++ b/index.pt_BR.html @@ -46,14 +46,14 @@ }(document, "script", "twitter-wjs");

      sistema de branches eficiente usando o git-flow, do Vincent Driessen

      -

      traduções: en - pt_BR

      +

      traduções: English - Português Brasileiro

      -

      Sobre

      +

      Sobre

      O git-flow é um conjunto de extensões para o git que provê operações de alto-nível para @@ -68,7 +68,7 @@

      -

      Dicas básicas

      +

      Dicas básicas

      • O git-flow oferece na linha de comando ajuda e saídas excelentes. Leia atentamente para ver o que está acontecendo...
        • @@ -81,7 +81,7 @@
        -

        Instalação

        +

        Instalação

        • Você precisa do git instalado como pré-requisito.
        • O git flow funciona no OSX, Linux e no Windows
          • @@ -113,7 +113,7 @@
        -

        Começando

        +

        Começando

        O git-flow precisa ser inicializado para personalizar a configuração de seu projeto.

        ★ ★ ★

        @@ -139,7 +139,7 @@
        -

        Funcionalidades/features

        +

        Funcionalidades/features

        • Desenvolva novas funcionalidades para as versões futuras
          • @@ -223,7 +223,7 @@
          -

          Criar uma versão/release

          +

          Criar uma versão/release

          • Auxilia a preparação de uma nova versão de produção
            • @@ -276,7 +276,7 @@
          -

          Hotfixes

          +

          Hotfixes

          • Os hotfixes surgem da necessidade de agir imediatamente sobre uma situação indesejada na versão de produção ativa
            • @@ -321,7 +321,7 @@
            -

            Comandos

            +

            Comandos

            git-flow commands
            From edbddfbc14adae36816bc9193df9d2450af62aa3 Mon Sep 17 00:00:00 2001 From: Daniel Kummer Date: Tue, 20 Nov 2012 10:50:17 +0100 Subject: [PATCH 002/106] make anchors bookmarkable --- index.html | 16 ++++++++-------- index.pt_BR.html | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/index.html b/index.html index 15a5c9f..747ec8c 100644 --- a/index.html +++ b/index.html @@ -46,7 +46,7 @@ }(document, "script", "twitter-wjs");

            efficient branching using git-flow by Vincent Driessen

            -

            translations: en - Brazilian Portugues

            +

            translations: English - Brazilian Portugues

            @@ -81,7 +81,7 @@
            -

            Setup

            +

            Setup

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

            Getting started

            +

            Getting started

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

            ★ ★ ★

            @@ -139,7 +139,7 @@
            -

            Features

            +

            Features

            • Develop new features for upcoming releases
              • @@ -232,7 +232,7 @@
              -

              Make a release

              +

              Make a release

              • Support preparation of a new production release
                • @@ -285,7 +285,7 @@
              -

              Hotfixes

              +

              Hotfixes

              • Hotfixes arise from the necessity to act immediately upon an undesired state of a live production version @@ -331,7 +331,7 @@
                -

                Commands

                +

                Commands

                git-flow commands
                @@ -354,7 +354,7 @@
                -

                Comments

                +

                Comments

                diff --git a/index.pt_BR.html b/index.pt_BR.html index 212c4d1..30c16f3 100644 --- a/index.pt_BR.html +++ b/index.pt_BR.html @@ -53,7 +53,7 @@
                -

                Sobre

                +

                Sobre

                O git-flow é um conjunto de extensões para o git que provê operações de alto-nível para @@ -68,7 +68,7 @@

                -

                Dicas básicas

                +

                Dicas básicas

                • O git-flow oferece na linha de comando ajuda e saídas excelentes. Leia atentamente para ver o que está acontecendo...
                  • @@ -81,7 +81,7 @@
                  -

                  Instalação

                  +

                  Instalação

                  • Você precisa do git instalado como pré-requisito.
                  • O git flow funciona no OSX, Linux e no Windows
                    • @@ -113,7 +113,7 @@
                  -

                  Começando

                  +

                  Começando

                  O git-flow precisa ser inicializado para personalizar a configuração de seu projeto.

                  ★ ★ ★

                  @@ -139,7 +139,7 @@
                  -

                  Funcionalidades/features

                  +

                  Funcionalidades/features

                  • Desenvolva novas funcionalidades para as versões futuras
                    • @@ -223,7 +223,7 @@
                    -

                    Criar uma versão/release

                    +

                    Criar uma versão/release

                    • Auxilia a preparação de uma nova versão de produção
                      • @@ -276,7 +276,7 @@
                    -

                    Hotfixes

                    +

                    Hotfixes

                    • Os hotfixes surgem da necessidade de agir imediatamente sobre uma situação indesejada na versão de produção ativa
                      • @@ -321,7 +321,7 @@
                      -

                      Comandos

                      +

                      Comandos

                      git-flow commands
                      From 4e5eec3d2b45990c9662239372e8806d3d0866b8 Mon Sep 17 00:00:00 2001 From: gelosie Date: Thu, 14 Mar 2013 14:38:44 +0800 Subject: [PATCH 003/106] translation of simplified chinese --- index.html | 3 +- index.zh_CN.html | 353 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 355 insertions(+), 1 deletion(-) create mode 100644 index.zh_CN.html diff --git a/index.html b/index.html index 747ec8c..e744fa0 100644 --- a/index.html +++ b/index.html @@ -46,7 +46,8 @@ }(document, "script", "twitter-wjs");

                      efficient branching using git-flow by Vincent Driessen

                      -

                      translations: English - Brazilian Portugues

                      +

                      translations: English - Brazilian Portugues
                      + English -> 简体中文(Simplified Chinese)

                      diff --git a/index.zh_CN.html b/index.zh_CN.html new file mode 100644 index 0000000..4b4d9aa --- /dev/null +++ b/index.zh_CN.html @@ -0,0 +1,353 @@ + + + + + + git-flow 备忘清单 + + + + + + + + + +
                      + +

                      git-flow 备忘清单

                      + +

                      + 由 Daniel Kummer (Tweet) 创建 + +

                      +

                      使用 git-flow 进行有效的分支实践。 by Vincent Driessen

                      +

                      翻译: English -> Brazilian Portugues +
                      + English -> 简体中文(Simplified Chinese)

                      +
                      + +
                      + + +
                      +

                      关于

                      + +

                      + git-flow 是一个 git 扩展集，按 Vincent Driessen 的分支模型提供高层次的库操作。 + 查看详情 +

                      +

                      ★ ★ ★

                      + +

                      这个备忘清单展示了 git-flow 的基本操作和效果。

                      + +

                      ★ ★ ★

                      +
                      + +
                      +

                      基础建议

                      +
                        +
                      • Git flow 提供了极出色的命令帮忙以及输出提示。请仔细阅读并观察发生了什么事情...
                        • +
                      • OSX 程序 Sourcetree 是一个极出色的 git 界面客户端，已经提供了 git-flow 的支持。
                        • +
                      • - Git-flow 是一个基于归并的解决方案，它并没有提供重置(rebase)特性分支的能力。
                        • +
                      +

                      ★ ★ ★

                      +
                      + + +
                      +

                      安装

                      +
                        +
                      • 你需要有一个可以工作的 git 作为前提。
                        • +
                      • Git flow 可以工作在 OSX, Linux 和 Windows之下
                        • +
                      +

                      ★ ★ ★

                      +
                      +

                      OSX

                      +
                      + $ brew 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 +
                      +

                      安装 git-flow, 你需要 wget 和 util-linux。

                      +
                      +
                      +

                      + 更多的 git flow 安装指引，请阅读 git flow wiki. +

                      + install git-flow +
                      +
                      + +
                      +

                      开始

                      +

                      为了自定义你的项目，Git flow 需要初始化过程。

                      +

                      ★ ★ ★

                      +
                      +

                      初始化

                      + +

                      使用 git-flow，从初始化一个现有的 git 库内开始:

                      +
                      + git flow init +
                      +

                      + 你必须回答几个关于分支的命名约定的问题。
                      建议使用默认值。 +

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

                      特性

                      + +
                        +
                      • 为即将发布的版本开发新功能特性。
                        • +
                      • 这通常只存在开发者的库中。
                        • +
                      +

                      ★ ★ ★

                      + +
                      +

                      增加新特性

                      +

                      新特性的开发是基于 'develop' 分支的。

                      +

                      通过下面的命令开始开发新特性：

                      +
                      + git flow feature start MYFEATURE +
                      +

                      这个操作创建了一个基于'develop'的特性分支，并切换到这个分支之下。

                      +
                      +
                      +
                      +
                      +
                      + +
                      +
                      +

                      完成新特性

                      + +

                      完成开发新特性。这个动作执行下面的操作. +

                      +
                        +
                      • 合并 MYFEATURE 分支到 'develop'
                        • +
                      • 删除这个新特性分支
                        • +
                      • 切换回 'develop' 分支
                        • +
                      + +
                      + git flow feature finish MYFEATURE +
                      +
                      +
                      +
                      +
                      +
                      + +
                      +
                      +

                      发布新特性

                      + +

                      + 你是否合作开发一项新特性？
                      + 发布新特性分支到远程服务器，所以，其它用户也可以使用这分支。 +

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

                      取得一个发布的新特性分支

                      + +

                      + 取得其它用户发布的新特性分支，并签出远程的变更。 +

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

                      作一个release版本

                      + +
                        +
                      • 支持一个新的用于生产环境的发布版本。
                        • +
                      • 允许修正小问题，并为发布版本准备元数据。
                        • +
                      +

                      ★ ★ ★

                      +
                      +

                      开始准备release版本

                      + +

                      开始准备release版本，使用 git flow release 命令.

                      + 它从 'develop' 分支开始创建一个 release 分支。 +

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

                      你可以选择提供一个 [BASE]参数，即提交记录的 sha-1 hash 值，来开启动 release 分支. 这个提交记录的 sha-1 hash 值必须是'develop' 分支下的。

                      +

                      ★ ★ ★

                      +

                      创建 release 分支之后立即发布允许其它用户向这个 release 分支提交见容是个明智的做法。命令十分类似发布新特性：

                      +
                      + git flow release publish RELEASE +
                      +

                      (你可以通过
                      git flow release track RELEASE 命令签出 release 版本的远程变更)

                      +
                      +
                      +
                      +
                      +
                      + +
                      +
                      +

                      完成 release 版本

                      + +

                      完成 release 版本是一个大 git 分支操作。它执行下面几个动作：

                      +
                        +
                      • 归并 release 分支到 'master' 分支
                        • +
                      • 用 release 分支名打 Tag
                        • +
                      • 归并 release 分支到 'develop'
                        • +
                      • 移除 release 分支
                        • +
                      +
                      + git flow release finish RELEASE +
                      +
                      +
                      +
                      + +
                      +
                      + +
                      +

                      热点修复

                      + +
                        +
                      • 热点修复来自这样的需求：生产环境的版本处于一个不预期状态，需要立即修正。
                        • +
                      • 有可能是需要修正 master 分支上某个 TAG 标记的生产版本。
                        • +
                      +

                      ★ ★ ★

                      +
                      +

                      开始 git flow 热点修复

                      + +

                      像其它 git flow 命令一样, 热点修复分支开始自：

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

                      VERSION 参数标记着修正版本。你可以从 [BASENAME]开始

                      +
                      +
                      +
                      +
                      +
                      + +
                      +
                      +

                      完成热点修复

                      + +

                      当完成热点分支，代码归并回 develop 和 master 分支。相应地，master 分支打上修正版本的 TAG。

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

                      命令

                      + git-flow commands +
                      + +
                      +

                      Backlog

                      +

                      ★ ★ ★

                      +
                        +
                      • 并非所有可用的命令都涵盖在这里，这里包含有最重要的部分命令。
                        • +
                      • 你依旧可以继续使用你所知道和了解的 git 命令， git flow 只是一个工具集合。
                        • +
                      • 'support' 功能只是测试版本, 不建议使用
                        • +
                      • 如何你乐意提供翻译，我很乐意整合它。
                        • +
                      +

                      ★ ★ ★

                      +
                      +
                      + + + + + + + + \ No newline at end of file From c7c6c3be7e641c41cec221843f72095688a117c8 Mon Sep 17 00:00:00 2001 From: gelosie Date: Thu, 14 Mar 2013 14:38:44 +0800 Subject: [PATCH 004/106] translation of simplified chinese --- index.html | 3 +- index.zh_CN.html | 348 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 350 insertions(+), 1 deletion(-) create mode 100644 index.zh_CN.html diff --git a/index.html b/index.html index 747ec8c..e744fa0 100644 --- a/index.html +++ b/index.html @@ -46,7 +46,8 @@ }(document, "script", "twitter-wjs");

                      efficient branching using git-flow by Vincent Driessen

                      -

                      translations: English - Brazilian Portugues

                      +

                      translations: English - Brazilian Portugues
                      + English -> 简体中文(Simplified Chinese)

                      diff --git a/index.zh_CN.html b/index.zh_CN.html new file mode 100644 index 0000000..fc59af9 --- /dev/null +++ b/index.zh_CN.html @@ -0,0 +1,348 @@ + + + + + + git-flow 备忘清单 + + + + + + + + + +
                      + +

                      git-flow 备忘清单

                      + +

                      + 由 Daniel Kummer (Tweet) 创建 + +

                      +

                      使用 git-flow 进行有效的分支实践。 by Vincent Driessen

                      +

                      翻译: English -> Brazilian Portugues +
                      + English -> 简体中文(Simplified Chinese)

                      +
                      + +
                      + + +
                      +

                      关于

                      + +

                      + git-flow 是一个 git 扩展集，按 Vincent Driessen 的分支模型提供高层次的库操作。 + 查看详情 +

                      +

                      ★ ★ ★

                      + +

                      这个备忘清单展示了 git-flow 的基本操作和效果。

                      + +

                      ★ ★ ★

                      +
                      + +
                      +

                      基础建议

                      +
                        +
                      • Git flow 提供了极出色的命令帮忙以及输出提示。请仔细阅读并观察发生了什么事情...
                        • +
                      • OSX 程序 Sourcetree 是一个极出色的 git 界面客户端，已经提供了 git-flow 的支持。
                        • +
                      • - Git-flow 是一个基于归并的解决方案，它并没有提供重置(rebase)特性分支的能力。
                        • +
                      +

                      ★ ★ ★

                      +
                      + + +
                      +

                      安装

                      +
                        +
                      • 你需要有一个可以工作的 git 作为前提。
                        • +
                      • Git flow 可以工作在 OSX, Linux 和 Windows之下
                        • +
                      +

                      ★ ★ ★

                      +
                      +

                      OSX

                      +
                      + $ brew 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 +
                      +

                      安装 git-flow, 你需要 wget 和 util-linux。

                      +
                      +
                      +

                      + 更多的 git flow 安装指引，请阅读 git flow wiki. +

                      + install git-flow +
                      +
                      + +
                      +

                      开始

                      +

                      为了自定义你的项目，Git flow 需要初始化过程。

                      +

                      ★ ★ ★

                      +
                      +

                      初始化

                      + +

                      使用 git-flow，从初始化一个现有的 git 库内开始:

                      +
                      + git flow init +
                      +

                      + 你必须回答几个关于分支的命名约定的问题。
                      建议使用默认值。 +

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

                      特性

                      + +
                        +
                      • 为即将发布的版本开发新功能特性。
                        • +
                      • 这通常只存在开发者的库中。
                        • +
                      +

                      ★ ★ ★

                      + +
                      +

                      增加新特性

                      +

                      新特性的开发是基于 'develop' 分支的。

                      +

                      通过下面的命令开始开发新特性：

                      +
                      + git flow feature start MYFEATURE +
                      +

                      这个操作创建了一个基于'develop'的特性分支，并切换到这个分支之下。

                      +
                      +
                      +
                      +
                      +
                      + +
                      +
                      +

                      完成新特性

                      + +

                      完成开发新特性。这个动作执行下面的操作. +

                      +
                        +
                      • 合并 MYFEATURE 分支到 'develop'
                        • +
                      • 删除这个新特性分支
                        • +
                      • 切换回 'develop' 分支
                        • +
                      + +
                      + git flow feature finish MYFEATURE +
                      +
                      +
                      +
                      +
                      +
                      + +
                      +
                      +

                      发布新特性

                      + +

                      + 你是否合作开发一项新特性？
                      + 发布新特性分支到远程服务器，所以，其它用户也可以使用这分支。 +

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

                      取得一个发布的新特性分支

                      + +

                      + 取得其它用户发布的新特性分支，并签出远程的变更。 +

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

                      作一个release版本

                      + +
                        +
                      • 支持一个新的用于生产环境的发布版本。
                        • +
                      • 允许修正小问题，并为发布版本准备元数据。
                        • +
                      +

                      ★ ★ ★

                      +
                      +

                      开始准备release版本

                      + +

                      开始准备release版本，使用 git flow release 命令.

                      + 它从 'develop' 分支开始创建一个 release 分支。 +

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

                      你可以选择提供一个 [BASE]参数，即提交记录的 sha-1 hash 值，来开启动 release 分支. 这个提交记录的 sha-1 hash 值必须是'develop' 分支下的。

                      +

                      ★ ★ ★

                      +

                      创建 release 分支之后立即发布允许其它用户向这个 release 分支提交见容是个明智的做法。命令十分类似发布新特性：

                      +
                      + git flow release publish RELEASE +
                      +

                      (你可以通过
                      git flow release track RELEASE 命令签出 release 版本的远程变更)

                      +
                      +
                      +
                      +
                      +
                      + +
                      +
                      +

                      完成 release 版本

                      + +

                      完成 release 版本是一个大 git 分支操作。它执行下面几个动作：

                      +
                        +
                      • 归并 release 分支到 'master' 分支
                        • +
                      • 用 release 分支名打 Tag
                        • +
                      • 归并 release 分支到 'develop'
                        • +
                      • 移除 release 分支
                        • +
                      +
                      + git flow release finish RELEASE +
                      +
                      +
                      +
                      + +
                      +
                      + +
                      +

                      热点修复

                      + +
                        +
                      • 热点修复来自这样的需求：生产环境的版本处于一个不预期状态，需要立即修正。
                        • +
                      • 有可能是需要修正 master 分支上某个 TAG 标记的生产版本。
                        • +
                      +

                      ★ ★ ★

                      +
                      +

                      开始 git flow 热点修复

                      + +

                      像其它 git flow 命令一样, 热点修复分支开始自：

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

                      VERSION 参数标记着修正版本。你可以从 [BASENAME]开始

                      +
                      +
                      +
                      +
                      +
                      + +
                      +
                      +

                      完成热点修复

                      + +

                      当完成热点分支，代码归并回 develop 和 master 分支。相应地，master 分支打上修正版本的 TAG。

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

                      命令

                      + git-flow commands +
                      + +
                      +

                      Backlog

                      +

                      ★ ★ ★

                      +
                        +
                      • 并非所有可用的命令都涵盖在这里，这里包含有最重要的部分命令。
                        • +
                      • 你依旧可以继续使用你所知道和了解的 git 命令， git flow 只是一个工具集合。
                        • +
                      • 'support' 功能只是测试版本, 不建议使用
                        • +
                      • 如何你乐意提供翻译，我很乐意整合它。
                        • +
                      +

                      ★ ★ ★

                      +
                      +
                      + + + + + + +comments powered by Disqus + + + \ No newline at end of file From 4c8c67de2ef1ed12d443aab46a557b9ac17d0643 Mon Sep 17 00:00:00 2001 From: gelosie Date: Thu, 14 Mar 2013 14:51:54 +0800 Subject: [PATCH 005/106] fix with markdown syntax --- README.md | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 831e08f..0706496 100644 --- a/README.md +++ b/README.md @@ -6,26 +6,35 @@ A cheatsheet on the usage of git flow, visit http://danielkummer.github.com/git- GIT FLOW ======== -Git extensions to provide high-level repository operations for Vincent -Driessen's branching model. — Read more: -http://nvie.com/posts/a-successful-git-branching-model/ +Git extensions to provide high-level repository operations for Vincent Driessen's branching model. [Read more](http://nvie.com/posts/a-successful-git-branching-model/) + INIT: + +``` $ git flow init +``` -TRACK DEVELOP REMOTELY ON GITHUB: +#### TRACK DEVELOP REMOTELY ON GITHUB: + + +``` $ git push origin develop +``` + +**FEATURES:** -FEATURES: Use to develop new features starting from the develop branch. Merge back into develop branch waiting for a reasonable amount of features to be there before declaring it a release. + +``` $ git flow feature $ git flow feature start $ git flow feature finish +``` - - +``` usage: git flow feature [list] [-v] git flow feature start [-F] [] git flow feature finish [-rFk] @@ -35,33 +44,42 @@ usage: git flow feature [list] [-v] git flow feature rebase [-i] [] git flow feature checkout [] git flow feature pull [] +``` +**RELEASES:** -RELEASES: Use to group together latest development (features) add a few finishing touches if necessary and send to production. All last changes will merge back to master and develop so new features will start from current release. + +``` $ git flow release $ git flow release start [] $ git flow release finish - +``` +``` usage: git flow release [list] [-v] git flow release start [-F] git flow release finish [-Fsumpk] git flow release publish git flow release track +``` +**HOTFIXES:** -HOTFIXES: Similar to releases but the hotfix branch starts off master to avoid unvoluntary send to production of unwanted features that my be present in branches. The quick fix must be used when an important bug arises in production which must be fixed and can't wait for other features to be ready. It merges back to master and develop. + +``` $ git flow hotfix $ git flow hotfix start [] $ git flow hotfix finish - +``` +``` usage: git flow hotfix [list] [-v] git flow hotfix start [-F] [] git flow hotfix finish [-Fsumpk] +``` From 929ec6e1d2e0f1184a6d0b247a14c93f420779cf Mon Sep 17 00:00:00 2001 From: gelosie Date: Thu, 14 Mar 2013 14:55:09 +0800 Subject: [PATCH 006/106] fix --- index.zh_CN.html | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/index.zh_CN.html b/index.zh_CN.html index 899c5c5..fc59af9 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -9,11 +9,6 @@ -<<<<<<< HEAD -======= - ->>>>>>> 4e5eec3d2b45990c9662239372e8806d3d0866b8 @@ -336,10 +327,6 @@
                -<<<<<<< HEAD -======= - ->>>>>>> 4e5eec3d2b45990c9662239372e8806d3d0866b8 \ No newline at end of file From c397df4a93a35b9f1f0ebb5c2dcd3364fde8a65b Mon Sep 17 00:00:00 2001 From: Daniel Kummer Date: Tue, 26 Mar 2013 13:52:27 +0100 Subject: [PATCH 007/106] fix translation links --- css/style.css | 2 +- index.html | 7 +++++-- index.pt_BR.html | 6 +++++- index.zh_CN.html | 12 +++++++----- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/css/style.css b/css/style.css index aeb0f4a..49c7025 100644 --- a/css/style.css +++ b/css/style.css @@ -331,7 +331,7 @@ code { position: absolute; top: 340px; width: 100%; - right: 15%; + right: 25%; text-align: right; } diff --git a/index.html b/index.html index e744fa0..e9a26fd 100644 --- a/index.html +++ b/index.html @@ -46,8 +46,11 @@ }(document, "script", "twitter-wjs");

                efficient branching using git-flow by Vincent Driessen

                -

                translations: English - Brazilian Portugues
                - English -> 简体中文(Simplified Chinese)

                +

                translations: + English - + Brazilian Portugues - + 简体中文(Simplified Chinese) +

                diff --git a/index.pt_BR.html b/index.pt_BR.html index 30c16f3..4e52172 100644 --- a/index.pt_BR.html +++ b/index.pt_BR.html @@ -46,7 +46,11 @@ }(document, "script", "twitter-wjs");

                sistema de branches eficiente usando o git-flow, do Vincent Driessen

                -

                traduções: English - Português Brasileiro

                +

                traduções: + English - + Português Brasileiro - + 简体中文(Simplified Chinese) +

                diff --git a/index.zh_CN.html b/index.zh_CN.html index fc59af9..fcbb5f4 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -32,12 +32,14 @@

                由 Daniel Kummer (Tweet) 创建 - +

                使用 git-flow 进行有效的分支实践。 by Vincent Driessen

                -

                翻译: English -> Brazilian Portugues -
                - English -> 简体中文(Simplified Chinese)

                +

                翻译: + English - + Brazilian Portugues - + 简体中文(Simplified Chinese) +

                @@ -174,7 +176,7 @@

                你是否合作开发一项新特性？
                - 发布新特性分支到远程服务器，所以，其它用户也可以使用这分支。 + 发布新特性分支到远程服务器，所以，其它用户也可以使用这分支。

                From 0c82b7d7a031b02be16e6eb3b3060ceca0faf56c Mon Sep 17 00:00:00 2001 From: Daniel Kummer Date: Tue, 14 May 2013 12:27:28 +0200 Subject: [PATCH 008/106] fix fork me link --- index.html | 2 +- index.zh_CN.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index e9a26fd..9c65074 100644 --- a/index.html +++ b/index.html @@ -27,7 +27,7 @@ - +

                git-flow cheatsheet

                diff --git a/index.zh_CN.html b/index.zh_CN.html index fcbb5f4..a12f128 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -25,7 +25,7 @@ - +

                git-flow 备忘清单

                From 1b7013e96c9ed1fdb0b17ebb2817ffd4dcf0efea Mon Sep 17 00:00:00 2001 From: tfunato Date: Thu, 20 Jun 2013 14:26:59 +0900 Subject: [PATCH 009/106] =?UTF-8?q?=E6=8E=A8=E6=95=B2=E5=89=8D=E3=81=AE?= =?UTF-8?q?=E6=9C=80=E5=88=9D=E3=81=AE=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.ja_JP.html | 378 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 378 insertions(+) create mode 100644 index.ja_JP.html diff --git a/index.ja_JP.html b/index.ja_JP.html new file mode 100644 index 0000000..af77c43 --- /dev/null +++ b/index.ja_JP.html @@ -0,0 +1,378 @@ + + + + + + git-flow cheatsheet + + + + + + + + + + + +
                + +

                git-flow cheatsheet

                + +

                + created by Daniel Kummer + + +

                +

                efficient branching using git-flow by Vincent Driessen

                +

                translations: + English - + Brazilian Portugues - + 简体中文(Simplified Chinese) - + 日本語 +

                +
                + +
                + + +
                +

                About

                + +

                + git-flowはgitの拡張であり、Vincent Driessenの提唱するブランチモデルを実現するための高度なリポジトリ操作を提供します。 + more +

                +

                ★ ★ ★

                + +

                このチートシートは基本的な使い方とgit-flowの効果を表します。

                + +

                ★ ★ ★

                +
                + +
                +

                Basic tips

                +
                  +
                • Git flow は素晴らしいコマンドライン補助と出力を提供します。何が起こるか注意深く読み解いてください。
                  • +
                • OSX Clientの Sourcetree は素晴らしいGUIとgit-flowサポートを提供します。
                  • +
                • - Git-flow はマージすることをベースとして考えるソリューションです。リベースは行いません。
                  • +
                +

                ★ ★ ★

                +
                + + +
                +

                Setup

                +
                  +
                • 前もってgitをインストールしておく必要があります。
                  • +
                • Git flow はOSX、Linux、Windowsで動作します。
                  • +
                +

                ★ ★ ★

                +
                +

                OSX

                +
                + $ brew 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 +
                +

                git-flowのインストールには、wgetとutil-linuxが必要です。

                +
                +
                +

                + 詳細なgit flowのインストール方法は以下のサイトを参考にしてください。 git flow + wiki. +

                + install git-flow +
                +
                + +
                +

                Getting started

                +

                Git flowを開始するには 既存のプロジェクトをカスタマイズする必要があります。

                +

                ★ ★ ★

                +
                +

                Initialize

                + +

                通常のgitリポジトリ配下に移動した後、下記のコマンドでgit-flow用に初期化します。

                +
                + git flow init +
                +

                + コマンドのあと対話形式で、いくつかの質問に答えます。 + 大体は、デフォルトの値が推奨されます。 +

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

                Features

                + +
                  +
                • 機能追加のための開発。
                  • +
                • Typically exist in developers repos only
                  • +
                +

                ★ ★ ★

                + +
                +

                Start a new feature

                +

                開発用ブランチは 'develop' ブランチから開始します。開始方法は、

                +
                + git flow feature start MYFEATURE +
                +

                新たな開発用ブランチを'develop'ブランチをベースとして作成し、開発用ブランチにスイッチします。

                + + +
                +
                +
                +
                +
                + +
                +
                +

                Finish up a feature

                + +

                + 開発が終了したら、以下の操作を行います。 +

                +
                  +
                • MYFEATUREブランチを'develop'にマージします。
                  • +
                • 開発用ブランチを削除します。
                  • +
                • そして、'develop'ブランチにスイッチをします。
                  • +
                + +
                + git flow feature finish MYFEATURE +
                +
                +
                +
                +
                +
                + +
                +
                +

                Publish a feature

                + +

                + 複数人と同じ機能を開発していたら？
                + 自分の変更分をリモートサーバにマージします。 +

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

                Getting a published feature

                + +

                + 他の人の開発分を自分のローカルにマージします。 +

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

                Make a release

                + +
                  +
                • リリースのための準備を行います
                  • +
                • 軽微なバグフィックスを行ったり、リリースのため設定の登録を行います
                  • +
                +

                ★ ★ ★

                +
                +

                Start a release

                + +

                リリース作業を開始するには、git flowのreleaseコマンドを使います

                + 'develop'ブランチから'release'ブランチをを作成します +

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

                [BASE]はオプションで 'develop'ブランチの特定のCommitのハッシュ値を指定します。指定がない場合はHEADが使われます。

                +

                ★ ★ ★

                +

                'release'ブランチ作成後に修正をPublishするには、'feature'の時と似たコマンドを使用します:

                +
                + git flow release publish RELEASE +
                +

                ('release'リポジトリの修正のトラッキングをすることもできます
                git flow release track RELEASE )

                +
                +
                +
                +
                +
                + +
                +
                +

                Finish up a release

                + +

                リリース作業の終了処理は、gitのブランチを扱う上で大きなアクションがあります:

                +
                  +
                • 'release'ブランチを'master'にマージします
                  • +
                • 'master'ブランチにリリース用のタグをつけます
                  • +
                • 'develop'ブランチに'release'ブランチの内容がマージされます
                  • +
                • 'release'ブランチが削除されます
                  • +
                +
                + git flow release finish RELEASE +
                +
                +
                +
                + +
                +
                + +
                +

                Hotfixes

                + +
                  +
                • Hotfixesはすぐに適用しなければいけないようような、緊急の場合に使用します
                  • +
                • May be branched off from the corresponding tag on the master branch that marks the production version.
                  • +
                +

                ★ ★ ★

                +
                +

                git flow hotfix start

                + +

                他のgit flowコマンドと似た形で、hotfixを開始します

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

                バージョンの引数は、ホットフィックスリリース名を指定します。 オプションとして開始するベースを指定出来ます。

                +

                +
                +
                +
                +
                +
                + +
                +
                +

                Finish a hotfix

                + +

                hotfixの終了作業は、'develop'と'master'のブランチをマージします。加えて、'master'ブランチはhotfixのバージョンでタグが付けられます。

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

                Commands

                + git-flow commands +
                + +
                +

                Backlog

                +

                ★ ★ ★

                +
                  +
                • 使用するコマンドがすべてをカバーしているわけではなく、重要なものだけカバーしています。
                  • +
                • もちろん、gitのコマンドは通常通りすべて使用することができます。git flowは単にgitのコマンドの集合です。
                  • +
                • 'support'ブランチの機能はまだベータ版です。それについては言及できません。
                  • +
                • もし翻訳して頂けるなら、統合してもらえると幸いです。
                  • +
                +

                ★ ★ ★

                +
                +
                + + + + + + + +comments powered by Disqus + + + + From 293f371dbf7edcbc4d63d5204c25900c592d70d9 Mon Sep 17 00:00:00 2001 From: tfunato Date: Thu, 20 Jun 2013 14:48:57 +0900 Subject: [PATCH 010/106] =?UTF-8?q?=E3=83=AA=E3=83=B3=E3=82=AF=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 5 +++-- index.pt_BR.html | 5 +++-- index.zh_CN.html | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/index.html b/index.html index 9c65074..5858764 100644 --- a/index.html +++ b/index.html @@ -49,7 +49,8 @@

                translations: English - Brazilian Portugues - - 简体中文(Simplified Chinese) + 简体中文(Simplified Chinese) - + 日本語

                @@ -383,4 +384,4 @@ - \ No newline at end of file + diff --git a/index.pt_BR.html b/index.pt_BR.html index 4e52172..e96cfcc 100644 --- a/index.pt_BR.html +++ b/index.pt_BR.html @@ -49,7 +49,8 @@

                traduções: English - Português Brasileiro - - 简体中文(Simplified Chinese) + 简体中文(Simplified Chinese) - + 日本語

                @@ -372,4 +373,4 @@ - \ No newline at end of file + diff --git a/index.zh_CN.html b/index.zh_CN.html index a12f128..039c1f9 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -39,6 +39,7 @@ English - Brazilian Portugues - 简体中文(Simplified Chinese) + 日本語

                @@ -347,4 +348,4 @@ comments powered by Disqus - \ No newline at end of file + From 82079801b7c4df72bd0b8fc849beb6db7f2861c1 Mon Sep 17 00:00:00 2001 From: tfunato Date: Thu, 20 Jun 2013 15:28:25 +0900 Subject: [PATCH 011/106] =?UTF-8?q?=E6=96=87=E8=A8=80=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.ja_JP.html | 60 ++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/index.ja_JP.html b/index.ja_JP.html index af77c43..def9412 100644 --- a/index.ja_JP.html +++ b/index.ja_JP.html @@ -116,18 +116,18 @@

                Getting started

                -

                Git flowを開始するには 既存のプロジェクトをカスタマイズする必要があります。

                +

                Git flowを開始するには 既存のプロジェクトをカスタマイズします。

                ★ ★ ★

                -

                Initialize

                +

                初期化

                -

                通常のgitリポジトリ配下に移動した後、下記のコマンドでgit-flow用に初期化します。

                +

                通常のgitリポジトリ配下に移動した後、下記のコマンドでgit-flow化します。

                git flow init

                コマンドのあと対話形式で、いくつかの質問に答えます。 - 大体は、デフォルトの値が推奨されます。 + 大体はデフォルトの値が推奨されます。

                @@ -144,13 +144,13 @@

                Features

                  -
                • 機能追加のための開発。
                  • -
                • Typically exist in developers repos only
                  • +
                • 通常の開発を行います。
                  • +
                • 基本的には開発者のリポジトリのみに行います。

                ★ ★ ★

                -

                Start a new feature

                +

                開発開始

                開発用ブランチは 'develop' ブランチから開始します。開始方法は、

                git flow feature start MYFEATURE @@ -175,10 +175,10 @@
                -

                Finish up a feature

                +

                開発終了

                - 開発が終了したら、以下の操作を行います。 + 開発が終了したらコマンドで以下の操作が行われます。

                • MYFEATUREブランチを'develop'にマージします。
                  • @@ -197,11 +197,11 @@
                  -

                  Publish a feature

                  +

                  開発分をリモートへ

                  - 複数人と同じ機能を開発していたら？
                  - 自分の変更分をリモートサーバにマージします。 + 複数人と同じ開発ブランチでを作業するときは、 + 自分の変更分をリモートサーバにプッシュします。

                  @@ -215,10 +215,10 @@
                  -

                  Getting a published feature

                  +

                  修正分を取り込む

                  - 他の人の開発分を自分のローカルにマージします。 + 他の人の修正分を自分のローカルにプルします。

                  @@ -235,12 +235,12 @@

                  Make a release

                    -
                  • リリースのための準備を行います
                    • -
                  • 軽微なバグフィックスを行ったり、リリースのため設定の登録を行います
                    • +
                  • リリースのための準備を行います。
                    • +
                  • 軽微なバグフィックスを行ったり、リリースのため作業を行います。

                  ★ ★ ★

                  -

                  Start a release

                  +

                  リリース準備開始

                  リリース作業を開始するには、git flowのreleaseコマンドを使います

                  'develop'ブランチから'release'ブランチをを作成します @@ -250,7 +250,7 @@

                  [BASE]はオプションで 'develop'ブランチの特定のCommitのハッシュ値を指定します。指定がない場合はHEADが使われます。

                  ★ ★ ★

                  -

                  'release'ブランチ作成後に修正をPublishするには、'feature'の時と似たコマンドを使用します:

                  +

                  'release'ブランチ作成後に修正をプッシュするには、'feature'の時と似たコマンドを使用します:

                  git flow release publish RELEASE
                  @@ -263,14 +263,14 @@
                  -

                  Finish up a release

                  +

                  リリース準備完了

                  -

                  リリース作業の終了処理は、gitのブランチを扱う上で大きなアクションがあります:

                  +

                  リリース準備の終了作業は、gitのリポジトリが大きく変化します:

                    -
                  • 'release'ブランチを'master'にマージします
                    • -
                  • 'master'ブランチにリリース用のタグをつけます
                    • -
                  • 'develop'ブランチに'release'ブランチの内容がマージされます
                    • -
                  • 'release'ブランチが削除されます
                    • +
                  • 'release'ブランチを'master'にマージします。
                    • +
                  • 'master'ブランチにリリース用のタグをつけます。
                    • +
                  • 'develop'ブランチに'release'ブランチの内容がマージされます。
                    • +
                  • 'release'ブランチが削除されます。
                  git flow release finish RELEASE @@ -286,12 +286,12 @@

                  Hotfixes

                    -
                  • Hotfixesはすぐに適用しなければいけないようような、緊急の場合に使用します
                    • -
                  • May be branched off from the corresponding tag on the master branch that marks the production version.
                    • +
                  • すぐに適用しなければいけないような、緊急の場合に使用します。
                    • +
                  • 'master'ブランチのタグから、緊急対応用のブランチを作成します。

                  ★ ★ ★

                  -

                  git flow hotfix start

                  +

                  緊急対応の開始

                  他のgit flowコマンドと似た形で、hotfixを開始します

                  @@ -307,9 +307,9 @@
                  -

                  Finish a hotfix

                  +

                  緊急対応の終了

                  -

                  hotfixの終了作業は、'develop'と'master'のブランチをマージします。加えて、'master'ブランチはhotfixのバージョンでタグが付けられます。

                  +

                  緊急対応の終了作業は、'develop'と'master'のブランチをマージします。加えて、'master'ブランチは緊急対応のタグが付けられます。

                  git flow hotfix finish VERSION
                  @@ -337,7 +337,7 @@

                  Backlog

                  ★ ★ ★

                    -
                  • 使用するコマンドがすべてをカバーしているわけではなく、重要なものだけカバーしています。
                    • +
                  • コマンドがすべてをカバーしているわけではなく、重要なものだけカバーしています。
                  • もちろん、gitのコマンドは通常通りすべて使用することができます。git flowは単にgitのコマンドの集合です。
                  • 'support'ブランチの機能はまだベータ版です。それについては言及できません。
                  • もし翻訳して頂けるなら、統合してもらえると幸いです。
                    • From cc28c6b9a7324997e3ff30a7d017f88eb2bfe6c1 Mon Sep 17 00:00:00 2001 From: tfunato Date: Thu, 20 Jun 2013 16:19:52 +0900 Subject: [PATCH 012/106] =?UTF-8?q?=E6=96=87=E7=AB=A0=E3=81=8C=E3=81=8A?= =?UTF-8?q?=E3=81=8B=E3=81=97=E3=81=84=E9=83=A8=E5=88=86=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.ja_JP.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.ja_JP.html b/index.ja_JP.html index def9412..1c62c31 100644 --- a/index.ja_JP.html +++ b/index.ja_JP.html @@ -200,7 +200,7 @@

                    開発分をリモートへ

                    - 複数人と同じ開発ブランチでを作業するときは、 + 複数人と同じ開発ブランチで作業するときは、 自分の変更分をリモートサーバにプッシュします。

                    From 9231fa45e1c6823dde9cd0353b5c0ac2a003e6bb Mon Sep 17 00:00:00 2001 From: Diego Perez Date: Sun, 4 Aug 2013 01:01:38 -0300 Subject: [PATCH 013/106] Update index.es.html cambio 'created by' a 'creado por' --- index.es.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.es.html b/index.es.html index 4e73011..0af6af7 100644 --- a/index.es.html +++ b/index.es.html @@ -33,7 +33,7 @@

                    git-flow cheatsheet

                    - created by Daniel Kummer + creado por Daniel Kummer + + + + + +

                    +
                    + +

                    git-flow cheatsheet

                    + +

                    + Tasarlayan: Daniel Kummer + + +

                    +

                    Vincent Driessen'ın verimli dallanma modeli kullanılarak tasarlanmıştır.

                    +

                    çeviriler: + English - + Brazilian Portugues - + 简体中文(Simplified Chinese) - + 日本語 - + Türkçe +

                    +
                    + +
                    + + +
                    +

                    Hakkında

                    + +

                    + git-flow, Vincent Driessen'in dallanma modeli için geliştirilmiş, git repoları için üst düzey işlemler + yapabilmenizi sağlayan, sözkonusu dallanma modelini kullanmayı oldukça kolaylaştıran git eklentilerini içerir. +
                    Vincent Driessen'in dallanma modeli hakkında                     +

                    +

                    ★ ★ ★

                    + +

                    Bu döküman git flow işlemleri hakkında temel kullanım şekillerini içermektedir.

                    + +

                    ★ ★ ★

                    +
                    + +
                    +

                    Temel Ipuçları

                    +
                      +
                    • Git flow komut satırları ile kusursuz yardım (help) ve çıktı (output) sağlar.
                      • +
                    • OSX ve Windows kullanıcıları için Sourcetree , git flowa destek + veren mükemmel bir git gui aracıdır. + +
                      • +
                    • 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.
                      • +
                    +

                    ★ ★ ★

                    +
                    + + +
                    +

                    Ayarlar

                    +
                      +
                    • Git flow'u kullanabilmek için öncelikli olarak git kurulumunun yapılması gerekmektedir.
                      • +
                    • Git flow OSX, Linux ve Windows üzerinde çalıştırılabilir.
                      • +
                    +

                    ★ ★ ★

                    +
                    +

                    OSX

                    +
                    + $ brew 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 +
                    +

                    Git flow kurulumu için wget ve util-linux gerekmektedir.

                    +
                    +
                    +

                    + Git-flow kurulumu hakkında detaylı bilgi için git flow wiki'yi + ziyaret edebilirsiniz.git flow + wiki. +

                    + install git-flow +
                    +
                    + +
                    +

                    Baslarken

                    +

                    Git flow, kullanmak istediğiniz projede ayarlarınızı özelleştirmek amacıyla başlatılır (initialize).

                    +

                    ★ ★ ★

                    +
                    +

                    Başlangıç (Initialize)

                    + +

                    git flow'u kullanmak istediğiniz reponuzdayken; +

                    +
                    + git flow init +
                    +

                    komutuyla başlatabilirsiniz. +

                    +

                    + Bu noktada kafanızda dallarınızı (branches) isimlendirme konusuna ilişkin birçok soru işareti oluşacaktır. + Bu bağlamda varsayılan (default) değerleri kullanmanız önerilir. +

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

                    Özellikler (Features)

                    + +
                      +
                    • Git flow ile yayınlamak üzere olduğunuz projenize ekleyeceğiniz özellikler için yeni dallarda (feature) kodlama yaparsınız.
                      • +
                    • Genel olarak sadece geliştirici repolarında bulunurlar.
                      • +
                    +

                    ★ ★ ★

                    + +
                    +

                    Yeni bir özellik eklemesi başlatmak

                    +

                    (feature start)

                    +

                    Yeni özelliklerin eklenmesi öncelikle develop dalından (branch) başlar.

                    +

                    Yeni bir özelliği kodlamaya

                    +
                    + git flow feature start MYFEATURE +
                    +

                    + 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. +

                    + + +
                    +
                    +
                    +
                    +
                    + +
                    +
                    +

                    Bir özellik eklemesi bitirilirken (feature finish)

                    + +

                    + Bir özelliğin eklenme işlemi bitirilirken şunları yapılır: +

                    +
                      +
                    • Kendi çalıştığımız özellik dalı (burada MYFEATURE) develop ana dalı ile birleştirilir.
                      • +
                    • Bu birleşmeden sonra kendi özellik dalımız (MYFEATURE) silinir.
                      • +
                    • Bulunduğumuz dal tekrar develop olarak değiştirilir.
                      • +
                    + +
                    + git flow feature finish MYFEATURE +
                    +

                    + bu işlemleri bizler için yapar. +

                    +
                    +
                    +
                    +
                    +
                    + +
                    +
                    +

                    Bir özelliği yayınlamak

                    +

                    (Publish a feature)

                    + +

                    + Bir ekip içerisinde geliştirme mi yapıyorsunuz ?
                    + 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 ; + +

                    + +
                    + git flow feature publish MYFEATURE +
                    +

                    + sizin için bu işi halledebilir. +

                    +
                    +
                    +
                    +
                    +
                    + +
                    +
                    +

                    Yayınlanmış bir özelliği almak (Getting a published feature)

                    + +

                    + Uzak sunucu üzerinde yayınlanmış bir özelliği kendi yerel (local) çalışma ortamınıza aktarırken: + +

                    + +
                    + git flow feature pull MYFEATURE +
                    +

                    + size yardımcı olacaktır. +

                    +
                    +
                    +
                    +
                    +
                    + + +
                    +

                    Bir yayın çıkarırken (release)

                    + +
                      +
                    • Yeni bir ürünün yayınlanmasına yardımcı olur.
                      • +
                    • Küçük hata giderimleri ve meta-data hazırlığı için kullanılabilir.
                      • +
                    +

                    ★ ★ ★

                    +
                    +

                    Bir sürüm yayınlamak

                    +

                    (Start a release)

                    + + +

                    Yayınlamaya başlamak için, + +

                    + git flow release start RELEASE [BASE] +
                    +

                    + komutu kullanılır.Bu komut ile develop dalını temel kabul eden bir release dalı (branch) yaratılır. +

                    +

                    Opsiyonel olarak yayınınızın [BASE] noktasından başlamasını sağlayabilirsiniz. + Bu commit develop dalında (branch) iken yapılmalıdır.

                    +

                    ★ ★ ★

                    +

                    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. +

                    +
                    + git flow release publish RELEASE +
                    +

                    (Uzak sunucu üzerindeki yayınları
                    + git flow release track RELEASE +
                    ile izleyebilirsiniz. )

                    +
                    +
                    +
                    +
                    +
                    + +
                    +
                    +

                    Bir sürüm yayınını tamamlamak

                    +

                    (Finish up a release)

                    + +

                    + 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: +

                    +
                      +
                    • Yayınlama yaptığımız dal olan release dalı (branch) master ana dalı ile birleştirilir.
                      • +
                    • Etiketler (tags) isimleri ile birlikte yayınlanır.
                      • +
                    • Arkaplandaki birleştirmeler (back-merges) develop dalında yayınlanır.
                      • +
                    • Yayınlama için açmış olduğumuz dal (branch) silinir.
                      • +
                    +
                    + git flow release finish RELEASE +
                    +

                    + sizler için bu işlemleri halledecektir. Ancak etiketlerinizi de eklemeyi unutmayın! + git push --tags bu sorununuzu da halledecektir. +

                    +
                    +
                    +
                    + +
                    +
                    + +
                    +

                    Hata giderimleri (Hotfixes)

                    + +
                      +
                    • Yayına çıkarılmış bir versiyonda istenmeyen durumlar ortaya çıktığında ani hata giderimi için kullanılır. +
                      • +
                    • Hotfixler, master ana dalı (branch)ındaki versiyon numarasını belirten etiketten dallanır (branching).
                      • +
                    +

                    ★ ★ ★

                    +
                    +

                    Bir hata giderimini başlatmak

                    +

                    (git flow hotfix start)

                    + +

                    Diğer git flow komutlarında olduğu gibi bir hotfix başlatılırken :

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

                    + 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).

                    +
                    +
                    +
                    +
                    +
                    + +
                    +
                    +

                    Hata giderimi bitirme

                    +

                    (Finish a hotfix)

                    + +

                    Bir hata giderimi tamamlanırken, develop ve master dalları ile birleştirilir. + Ayrıca master dalına (branch) hotfix versiyonunun etiketi eklenir.

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

                    Komutlar (Commands)

                    + git-flow commands +
                    + +
                    +

                    Içerik bilgisi (Backlog)

                    +

                    ★ ★ ★

                    +
                      +
                    • Bu dökümanda Git flow için en önemli komutlar ve kullanımları ile ilgili bilgiler verilmektedir. + Ancak tüm Git flow komutları burda bahsedilenlerle sınırlı değildir.
                      • +
                    • 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. +
                      • +
                    • Support branch hala beta sürümündedir.Kullanımı tavsiye edilmemektedir.
                      • +
                    • Çevirilerinizle bize destek olabilirsiniz.Bunları projemize eklemekten mutluluk duyarız.
                      • +
                    +

                    ★ ★ ★

                    +
                    +
                    + + + + + + + +comments powered by Disqus + + + + diff --git a/index.zh_CN.html b/index.zh_CN.html index 039c1f9..f703e4c 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -39,7 +39,8 @@ English - Brazilian Portugues - 简体中文(Simplified Chinese) - 日本語 + 日本語 - + Türkçe

                    From 044fbfecf1548e8114372be6a86704c490165f37 Mon Sep 17 00:00:00 2001 From: Brian Dant Date: Sat, 5 Oct 2013 15:05:31 -0400 Subject: [PATCH 021/106] Removes text shadow The text shadow on the

                    tags is distracting IMHO. --- css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/style.css b/css/style.css index a03c33b..423011c 100644 --- a/css/style.css +++ b/css/style.css @@ -59,7 +59,7 @@ h3 { p { margin: 20px auto; - text-shadow: 0 2px 1px #fff; + text-shadow: none; color: #222438; } From 265da13d1e54183a342e9deb19fab97fc4686162 Mon Sep 17 00:00:00 2001 From: Brian Dant Date: Sun, 6 Oct 2013 06:02:57 -0400 Subject: [PATCH 022/106] Removes text shadow on `ul` elements. --- css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/style.css b/css/style.css index 423011c..ede2dc7 100644 --- a/css/style.css +++ b/css/style.css @@ -93,7 +93,7 @@ ul { margin-left: 0; padding-left: 1em; text-indent: -1em; - text-shadow: 0 2px 1px #fff; + text-shadow: none; line-height: 1.4; } From 694d1e69a3c70d5c9a950f5540cfda506850b81e Mon Sep 17 00:00:00 2001 From: DalHo Park Date: Tue, 22 Oct 2013 21:09:07 +0900 Subject: [PATCH 023/106] Added a translation(Korean). --- index.es.html | 1 + index.html | 1 + index.ja_JP.html | 1 + index.ko_KR.html | 384 +++++++++++++++++++++++++++++++++++++++++++++++ index.pt_BR.html | 1 + index.tr_TR.html | 1 + index.zh_CN.html | 1 + 7 files changed, 390 insertions(+) create mode 100644 index.ko_KR.html diff --git a/index.es.html b/index.es.html index 2679079..dd29eac 100644 --- a/index.es.html +++ b/index.es.html @@ -52,6 +52,7 @@ Brazilian Portugues - 简体中文(Simplified Chinese) - 日本語 + 한국어(Korean)

                    diff --git a/index.html b/index.html index 79d7e8a..ebb8030 100644 --- a/index.html +++ b/index.html @@ -53,6 +53,7 @@ 简体中文(Simplified Chinese) - 日本語 - Türkçe + 한국어(Korean)

                    diff --git a/index.ja_JP.html b/index.ja_JP.html index a937984..94aa00a 100644 --- a/index.ja_JP.html +++ b/index.ja_JP.html @@ -53,6 +53,7 @@ 简体中文(Simplified Chinese) - 日本語 - Türkçe + 한국어(Korean)

                    diff --git a/index.ko_KR.html b/index.ko_KR.html new file mode 100644 index 0000000..3e37544 --- /dev/null +++ b/index.ko_KR.html @@ -0,0 +1,384 @@ + + + + + + git-flow cheatsheet + + + + + + + + + + + +
                    + +

                    git-flow cheatsheet

                    + +

                    + created by Daniel Kummer + + +

                    +

                    efficient branching using git-flow by Vincent Driessen

                    +

                    translations: + English - + Castellano - + Brazilian Portugues - + 简体中文(Simplified Chinese) - + 日本語 - + Türkçe + 한국어(Korean) +

                    +
                    + +
                    + + +
                    +

                    About

                    + +

                    + git-flow는 Vincent Driessen의 브랜칭 모델을 위한 고수준 저장소 작업을 제공하는 git의 확장입니다. + more +

                    +

                    ★ ★ ★

                    + +

                    이 치트 시트는 기본적인 사용법과 git-flow 작업의 효과를 보여줍니다.

                    + +

                    ★ ★ ★

                    +
                    + +
                    +

                    Basic tips

                    +
                      +
                    • Git flow는 훌륭한 명령행 도움말과 출력을 제공합니다. 무슨 일이 일어나는지를 알려면 출력을 주의깊게 읽어주세요.
                      • +
                    • OSX/Window Client Sourcetree는 훌륭한 git gui를 제공하고 git-flow에 대한 지원을 제공합니다.
                      • +
                    • Git-flow는 병합(merge) 기반의 솔루션입니다. feature 브랜치를 리베이스(rebase)하지 않습니다.
                      • +
                    +

                    ★ ★ ★

                    +
                    + + +
                    +

                    Setup

                    +
                      +
                    • 사전에 제대로 동작하는 git이 설치되어 있어야합니다.
                      • +
                    • Git flow는 OSX, Linux, Windows에서 동작합니다.
                      • +
                    +

                    ★ ★ ★

                    +
                    +

                    OSX

                    +
                    + $ brew 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 +
                    +

                    git-flow의 설치를 위해서는 wget과 util-linux가 필요합니다.

                    +
                    +
                    +

                    + 상세한 git flow의 설치 방법은 git flow wiki를 참고하세요. +

                    + install git-flow +
                    +
                    + +
                    +

                    Getting started

                    +

                    Git flow는 프로젝트 설정을 변경하기위해 초기화를 필요로합니다.

                    +

                    ★ ★ ★

                    +
                    +

                    초기화

                    + +

                    기존 git 저장소 내에서 초기화하는 것으로 git-flow의 사용을 시작합니다

                    +
                    + git flow init +
                    +

                    + 몇몇 질문에 대답해서 브랜치의 명명규척을 정합니다. + 기본 값을 사용하기를 권장합니다. +

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

                    Features

                    + +
                      +
                    • 다가오는 배포(release)를 위한 새 기능(feature)을 개발합니다.
                      • +
                    • 일반적으로 개발자의 저장소에만 존재합니다.
                      • +
                    +

                    ★ ★ ★

                    + +
                    +

                    새 기능(feature) 시작하기

                    +

                    새 기능의 개발은 'develop' 브랜치에서 시작합니다.

                    +

                    다음과 같이 새 기능의 개발을 시작합니다.

                    +
                    + git flow feature start MYFEATURE +
                    +

                    이것은 'develop'에 기반한 새 기능(feature) 브랜치를 생성하고 그 브랜치로 전환합니다.

                    + + +
                    +
                    +
                    +
                    +
                    + +
                    +
                    +

                    기능 완료

                    + +

                    + 기능 개발을 완료합니다. + 이것은 다음 작업들을 수행합니다. +

                    +
                      +
                    • MYFEATURE 브랜치를 'develop'에 병합(merge)합니다.
                      • +
                    • 기능 브랜치를 삭제합니다.
                      • +
                    • 'develop' 브랜치로 전환합니다.
                      • +
                    + +
                    + git flow feature finish MYFEATURE +
                    +
                    +
                    +
                    +
                    +
                    + +
                    +
                    +

                    기능을 게시(publish)

                    + +

                    + 기능을 공동으로 개발하고 있나요?
                    + 기능을 원격 서버에 게시하여 다른 사용자들도 사용할 수있게 합니다. +

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

                    게시된 기능 가져오기

                    + +

                    + 다른 사용자가 게시한 기능을 가져오고 원격 변경을 추적합니다. +

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

                    Make a release

                    + +
                      +
                    • 새로운 제품 출시 준비를 지원합니다.
                      • +
                    • 출시를 위한 사소한 버그 수정이나 메타 데이터 준비를 허용합니다.
                      • +
                    +

                    ★ ★ ★

                    +
                    +

                    출시 시작

                    + +

                    릴리스를 시작하려면 git flow의 release 명령을 사용합니다.

                    + 'develop' 브랜치로부터 'release' 브랜치를 생성합니다. +

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

                    릴리스를 시작할 [BASE] commit sha-1 해시를 선택적으로 줄 수도 있습니다. 그 commit은 반드시 'develop' 브랜치에 있어야합니다.

                    +

                    ★ ★ ★

                    +

                    릴리스 브랜치를 생성한 후에는 다른 개발자들의 릴리스 commit을 허용하기위해 게시(publish)하는 것이 현명합니다. 기능 게시와 비슷한 방법으로합니다:

                    +
                    + git flow release publish RELEASE +
                    +

                    (원격 'release' 브랜치의 변경 추적은 다음과 같이 합니다
                    git flow release track RELEASE )

                    +
                    +
                    +
                    +
                    +
                    + +
                    +
                    +

                    릴리스 완료

                    + +

                    릴리스 완료는 git 브랜치하기에서 가장 큰 단계입니다. 몇몇 작업을 수행합니다:

                    +
                      +
                    • 'release' 브랜치를 'master' 브랜치에 병합(merge)
                      • +
                    • 릴리스를 릴리스 이름으로 태그(tag)
                      • +
                    • 릴리스를 'develop' 브랜치로 재병합(back-merge)
                      • +
                    • 'release' 브랜치 삭제
                      • +
                    +
                    + git flow release finish RELEASE +
                    +

                    git push --tags를 사용해 태그들을 push하는 것을 잊지마세요.

                    + +
                    +
                    +
                    + +
                    +
                    + +
                    +

                    Hotfixes

                    + +
                      +
                    • 핫픽스는 현재 출시된 제품에 문제가 생겨서 즉각 대응해야하는 상황에서 필요하다.
                      • +
                    • 'master' 브랜치의 현재 출시된 버전으로 표기(mark)된 태그(tag)로부터 브랜치를 딴다.
                      • +
                    +

                    ★ ★ ★

                    +
                    +

                    핫픽스 시작

                    + +

                    여타 git flow 명령과 비슷한 방법으로 시작합니다.

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

                    여기서 버전 인수는 핫픽스 릴리스 이름을 지정합니다. 선택적으로 basename으로 시작점을 지정할 수도 있습니다.

                    +

                    +
                    +
                    +
                    +
                    +
                    + +
                    +
                    +

                    핫픽스 완료

                    + +

                    핫픽스를 종료하면 핫픽스는 'develop' 및 'master' 브랜치로 병합(merge)됩니다. 추가적으로 'master'의 병합분분은 핫픽스 버전으로 태그됩니다.

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

                    Commands

                    + git-flow commands +
                    + +
                    +

                    Backlog

                    +

                    ★ ★ ★

                    +
                      +
                    • 여기서는 모든 명령을 다루지 않았습니다. 중요한 것들만 설명했습니다.
                      • +
                    • git 명령도 사용할 수 있습니다. git flow는 단지 도구 모음일 뿐입니다.
                      • +
                    • 'support' 기능은 아직 베타 버전입니다. 사용은 권장되지 않습니다.
                      • +
                    • 번역해주신다면 저는 행복하게 통합할 것입니다.
                      • +
                    +

                    ★ ★ ★

                    +
                    +
                    + + + + + + + +comments powered by Disqus + + + + diff --git a/index.pt_BR.html b/index.pt_BR.html index fc51060..5d6e3c7 100644 --- a/index.pt_BR.html +++ b/index.pt_BR.html @@ -53,6 +53,7 @@ 简体中文(Simplified Chinese) - 日本語 - Türkçe + 한국어(Korean)

                    diff --git a/index.tr_TR.html b/index.tr_TR.html index 004085a..9d6c740 100644 --- a/index.tr_TR.html +++ b/index.tr_TR.html @@ -52,6 +52,7 @@ 简体中文(Simplified Chinese) - 日本語 - Türkçe + 한국어(Korean)

                    diff --git a/index.zh_CN.html b/index.zh_CN.html index ca5c83a..1633846 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -42,6 +42,7 @@ 简体中文(Simplified Chinese) 日本語 - Türkçe + 한국어(Korean)

                    From de7db6ed4bfcc39320396e17a711e3ec814190a1 Mon Sep 17 00:00:00 2001 From: DalHo Park Date: Tue, 22 Oct 2013 21:18:15 +0900 Subject: [PATCH 024/106] changed a few words. --- index.ko_KR.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.ko_KR.html b/index.ko_KR.html index 3e37544..0353ecc 100644 --- a/index.ko_KR.html +++ b/index.ko_KR.html @@ -244,7 +244,7 @@

                  ★ ★ ★

                  -

                  출시 시작

                  +

                  릴리스 시작

                  릴리스를 시작하려면 git flow의 release 명령을 사용합니다.

                  'develop' 브랜치로부터 'release' 브랜치를 생성합니다. @@ -292,8 +292,8 @@

                  Hotfixes

                    -
                  • 핫픽스는 현재 출시된 제품에 문제가 생겨서 즉각 대응해야하는 상황에서 필요하다.
                    • -
                  • 'master' 브랜치의 현재 출시된 버전으로 표기(mark)된 태그(tag)로부터 브랜치를 딴다.
                    • +
                  • 핫픽스는 현재 출시된 제품에 문제가 생겨서 즉각 대응해야하는 상황에서 필요합니다.
                    • +
                  • 'master' 브랜치의 현재 출시된 버전으로 표기(mark)된 태그(tag)로부터 브랜치를 땁니다.

                  ★ ★ ★

                  From e26dbb112a4f0c60ff2bfecde635369712bed06d Mon Sep 17 00:00:00 2001 From: DalHo Park Date: Thu, 24 Oct 2013 10:25:10 +0900 Subject: [PATCH 025/106] fixed a typo. --- index.ko_KR.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.ko_KR.html b/index.ko_KR.html index 0353ecc..bcd5ff5 100644 --- a/index.ko_KR.html +++ b/index.ko_KR.html @@ -128,7 +128,7 @@ git flow init

                  - 몇몇 질문에 대답해서 브랜치의 명명규척을 정합니다. + 몇몇 질문에 대답해서 브랜치의 명명규칙을 정합니다. 기본 값을 사용하기를 권장합니다.

                  From ad4bc6546a437074c86503b9eec20994c8d97d13 Mon Sep 17 00:00:00 2001 From: Daniel Kummer Date: Tue, 19 Nov 2013 10:35:04 +0100 Subject: [PATCH 026/106] fix error in feature description --- css/style.css | 2 +- index.html | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/css/style.css b/css/style.css index ede2dc7..8bf7c5b 100644 --- a/css/style.css +++ b/css/style.css @@ -158,7 +158,7 @@ code { .lines-big { width: 300px; - height: 4315px; + height: 4395px; background-repeat: repeat-y; background: url("../img/lines-big.png"); position: absolute; diff --git a/index.html b/index.html index ebb8030..7a41382 100644 --- a/index.html +++ b/index.html @@ -226,12 +226,14 @@

                  Getting a published feature

                  - Get a feature published by another user and track remote changes. + Get a feature published by another user.

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

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

                  From 0309f723137c941cba2f1a5f1e8a6b944e752b96 Mon Sep 17 00:00:00 2001 From: Bruno Paulin Date: Fri, 17 Jan 2014 13:26:49 +0100 Subject: [PATCH 027/106] french translation --- index.es.html | 1 + index.fr_FR.html | 389 +++++++++++++++++++++++++++++++++++++++++++++++ index.html | 1 + index.ja_JP.html | 1 + index.ko_KR.html | 1 + index.pt_BR.html | 1 + index.tr_TR.html | 1 + index.zh_CN.html | 1 + 8 files changed, 396 insertions(+) create mode 100644 index.fr_FR.html diff --git a/index.es.html b/index.es.html index dd29eac..d23fbce 100644 --- a/index.es.html +++ b/index.es.html @@ -53,6 +53,7 @@ 简体中文(Simplified Chinese) - 日本語 한국어(Korean) + Français

                  diff --git a/index.fr_FR.html b/index.fr_FR.html new file mode 100644 index 0000000..3cdc8d3 --- /dev/null +++ b/index.fr_FR.html @@ -0,0 +1,389 @@ + + + + + + git-flow cheatsheet + + + + + + + + + + + +
                  + +

                  git-flow cheatsheet

                  + +

                  + créé par Daniel Kummer + + +

                  +

                  modèle de versionnement efficace utilisant git-flow par Vincent Driessen

                  +

                  traductions: + English - + Castellano - + Brazilian Portugues - + 简体中文(Simplified Chinese) - + 日本語 - + Türkçe + 한국어(Korean) + Français +

                  +
                  + +
                  + + +
                  +

                  A propos

                  + +

                  + 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. + détails +

                  +

                  ★ ★ ★

                  + +

                  Cet aide-mémoire montre l'utilisation et les effets des opérations git-flow

                  + +

                  ★ ★ ★

                  +
                  + +
                  +

                  Conseils de base

                  +
                    +
                  • Les commandes et sorties de Git-flow apportent une aide précieuse. Lisez les attentivement pour comprendre ce qui se passe...
                    • +
                  • Le logiciel pour OSX Sourcetree est une excellente interface graphique pour git qui supporte git-flow. +
                    • +
                  • Git-flow est une solution basée sur les fusions (merge). Elle n'effectue pas de rebase sur les branches de fonctionnalitées
                    • +
                  +

                  ★ ★ ★

                  +
                  + + +
                  +

                  Installation

                  +
                    +
                  • Une installation fonctionnelle de git est requise
                    • +
                  • Git flow fonctionne sur OSX, Linux et Windows
                    • +
                  +

                  ★ ★ ★

                  +
                  +

                  OSX

                  +
                  + $ brew 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 +
                  +

                  Vous aurez besoin de wget et de util-linux pour installer git-flow.

                  +
                  +
                  +

                  + Pour des instructions détaillées concernant l'installation de git-flow, consultez le + wiki git-flow. +

                  + install git-flow +
                  +
                  + +
                  +

                  Premiers pas

                  +

                  Git flow doit être initialisé afin de personnaliser la configuration de votre projet.

                  +

                  ★ ★ ★

                  +
                  +

                  Initialisation

                  + +

                  Commencez à utiliser git-flow en l'initialisant dans un dépot git existant:

                  +
                  + git flow init +
                  +

                  + Vous devrez répondre à quelques questions concernant les conventions de nommage pour vos branches.
                  + Il est recommandé d'utiliser les valeurs par défaut. +

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

                  Fonctionnalités/Features

                  + +
                    +
                  • Developpe des nouvelles fonctionnalités pour la prochaine version
                    • +
                  • Existe en général uniquement dans les dépots des développeurs
                    • +
                  +

                  ★ ★ ★

                  + +
                  +

                  Commencer une feature

                  +

                  Le développement d'une fonctionnalité commence à partir de la branche 'develop'

                  +

                  Commencer le développement d'une nouvelle fonctionnalité avec:

                  +
                  + git flow feature start MYFEATURE +
                  +

                  Cette commande crée une nouvelle branche de fonctionnalité basée sur 'develop' et passe sur cette branche

                  + + +
                  +
                  +
                  +
                  +
                  + +
                  +
                  +

                  Terminer une fonctionnalité

                  +

                  + Termine le développement d'une fonctionnalité. + Cette action effectue les opérations suivantes: +

                  +
                    +
                  • fusionne MYFEATURE dans 'develop'
                    • +
                  • Supprime la branche de fonctionnalité
                    • +
                  • Passe sur la branche 'develop'
                    • +
                  + +
                  + git flow feature finish MYFEATURE +
                  +
                  +
                  +
                  +
                  +
                  + +
                  +
                  +

                  Publier une fonctionnalité

                  + +

                  + Vous développez une fonctionnalité en collaboration?
                  + Publiez une fonctionnalité sur le serveur distant pour qu'elle puisse être utilisée par d'autres utilisateurs. +

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

                  Récupérer une fonctionnalité publiée

                  + +

                  + Récupérer une fonctionnalité publiée par un autre utilisateur +

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

                  Vous pouvez suivre une fonctionnalité sur le serveur distant en utilisant git flow feature track MYFEATURE

                  +
                  +
                  +
                  +
                  +
                  + + +
                  +

                  Livraison/Release

                  + +
                    +
                  • Prépare la sortie d'une nouvelle version de production
                    • +
                  • Permet les corrections de bugs mineurs et la préparation des métadonnées de la release
                    • +
                  +

                  ★ ★ ★

                  +
                  +

                  Commencer une livraison

                  + +

                  Pour commencer une livraison, utilisez la commande git-flow release

                  + créer une branche de livraison basée sur la branche de développement. +

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

                  Vous pouvez si besoin ajouter le paramètre [BASE], le hash d'un commit à partir duquel commencera la livraison. Ce commit doit faire partie de la branche de developpment.

                  +

                  ★ ★ ★

                  +

                  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é, utilisez cette commande:

                  +
                  + git flow release publish RELEASE +
                  +

                  Vous pouvez suivre une livraison sur le serveur distant en utilisant
                  git flow release track RELEASE command)

                  +
                  +
                  +
                  +
                  +
                  + +
                  +
                  +

                  Terminer une livraison

                  + +

                  Terminer une livraison est une des étapes majeures de cette méthode. Plusieurs actions sont réalisées:

                  +
                    +
                  • Fusionne la branche de livraison dans la branche 'master'
                    • +
                  • Etiquette la livraison par son nom
                    • +
                  • Fusionne la livraison dans la branche 'develop'
                    • +
                  • Supprime la branche de livraison
                    • +
                  +
                  + git flow release finish RELEASE +
                  +

                  N'oubliez pas de pousser vos étiquettes avec git push --tags

                  + +
                  +
                  +
                  + +
                  +
                  + +
                  +

                  Correctifs/Hotfixes

                  + +
                    +
                  • Les correctifs sont utiles quand il est nécessaire de corriger immédiatement l'état incorrect de la version en production +
                    • +
                  • Ils peuvent se baser sur l'étiquette de la branche 'master' indiquant la version en production.
                    • +
                  +

                  ★ ★ ★

                  +
                  +

                  Commencer un hotfix

                  + +

                  Comme pour les autres commandes git-flow, un hotfix est commencé par

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

                  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.

                  +
                  +
                  +
                  +
                  +
                  + +
                  +
                  +

                  Terminer un hotfix

                  + +

                  En terminant un hotfix, il est fusionné dans les branches 'develop' et 'master'. De plus la fusion vers 'master' est etiqueté par la version du hotfix.

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

                  Commandes

                  + git-flow commands +
                  + +
                  +

                  En suspens

                  +

                  ★ ★ ★

                  +
                    +
                  • Toutes les commandes disponibles ne sont pas abordées ici, seulement les principales
                    • +
                  • 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 +
                    • +
                  • la fonction 'support' est encore en version bêta, il n'est pas conseillé de l'utiliser
                    • +
                  • Si vous voulez ajouter des traductions de ce document, je les intégrerai avec plaisir
                    • +
                  +

                  ★ ★ ★

                  +
                  +
                  + + + + + + + +comments powered by Disqus + + + + diff --git a/index.html b/index.html index 7a41382..10d5499 100644 --- a/index.html +++ b/index.html @@ -54,6 +54,7 @@ 日本語 - Türkçe 한국어(Korean) + Français

                  diff --git a/index.ja_JP.html b/index.ja_JP.html index 94aa00a..3463ad5 100644 --- a/index.ja_JP.html +++ b/index.ja_JP.html @@ -54,6 +54,7 @@ 日本語 - Türkçe 한국어(Korean) + Français

                  diff --git a/index.ko_KR.html b/index.ko_KR.html index bcd5ff5..23fc407 100644 --- a/index.ko_KR.html +++ b/index.ko_KR.html @@ -54,6 +54,7 @@ 日本語 - Türkçe 한국어(Korean) + Français

                  diff --git a/index.pt_BR.html b/index.pt_BR.html index 5d6e3c7..d2859c8 100644 --- a/index.pt_BR.html +++ b/index.pt_BR.html @@ -54,6 +54,7 @@ 日本語 - Türkçe 한국어(Korean) + Français

                  diff --git a/index.tr_TR.html b/index.tr_TR.html index 9d6c740..ea6142c 100644 --- a/index.tr_TR.html +++ b/index.tr_TR.html @@ -53,6 +53,7 @@ 日本語 - Türkçe 한국어(Korean) + Français

                  diff --git a/index.zh_CN.html b/index.zh_CN.html index 1633846..8b7c41a 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -43,6 +43,7 @@ 日本語 - Türkçe 한국어(Korean) + Français

                  From 5ab75f58b6192cb12bd784b078c0560229aff46d Mon Sep 17 00:00:00 2001 From: Bruno Paulin Date: Fri, 17 Jan 2014 15:24:23 +0100 Subject: [PATCH 028/106] corrections typo thanks to @asubit --- index.fr_FR.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.fr_FR.html b/index.fr_FR.html index 3cdc8d3..8d17925 100644 --- a/index.fr_FR.html +++ b/index.fr_FR.html @@ -256,13 +256,13 @@
                  git flow release start RELEASE [BASE]
                  -

                  Vous pouvez si besoin ajouter le paramètre [BASE], le hash d'un commit à partir duquel commencera la livraison. Ce commit doit faire partie de la branche de developpment.

                  +

                  Vous pouvez si besoin ajouter le paramètre [BASE], le hash d'un commit à partir duquel commencera la livraison. Ce commit doit faire partie de la branche de développement.

                  ★ ★ ★

                  -

                  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é, utilisez cette commande:

                  +

                  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:

                  git flow release publish RELEASE
                  -

                  Vous pouvez suivre une livraison sur le serveur distant en utilisant
                  git flow release track RELEASE command)

                  +

                  Vous pouvez suivre une livraison sur le serveur distant en utilisant
                  git flow release track RELEASE

                  @@ -319,7 +319,7 @@

                  Terminer un hotfix

                  -

                  En terminant un hotfix, il est fusionné dans les branches 'develop' et 'master'. De plus la fusion vers 'master' est etiqueté par la version du hotfix.

                  +

                  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.

                  git flow hotfix finish VERSION
                  From d35fe7d74287c5c9af2980f6212afcd21a4166bf Mon Sep 17 00:00:00 2001 From: Bruno Paulin Date: Sat, 18 Jan 2014 10:52:43 +0100 Subject: [PATCH 029/106] css correction too many translations now --- css/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/css/style.css b/css/style.css index 8bf7c5b..91e896e 100644 --- a/css/style.css +++ b/css/style.css @@ -331,7 +331,7 @@ code { position: absolute; top: 340px; width: 100%; - right: 25%; + right: 5%; text-align: right; } From 60b9156f0846d1d129531c349b710023b178782d Mon Sep 17 00:00:00 2001 From: John Wu Date: Sat, 15 Feb 2014 00:55:08 +0800 Subject: [PATCH 030/106] Use lang='zh-CN' to optimize font display It should look much better --- index.zh_CN.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.zh_CN.html b/index.zh_CN.html index 8b7c41a..179a772 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -1,5 +1,5 @@ - + From 07554ccc96a4bf776e169d0f76c92062c182b354 Mon Sep 17 00:00:00 2001 From: Andrea Mostosi Date: Sun, 20 Apr 2014 09:25:25 +0200 Subject: [PATCH 031/106] Italian translation --- index.it_IT.html | 389 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 389 insertions(+) create mode 100644 index.it_IT.html diff --git a/index.it_IT.html b/index.it_IT.html new file mode 100644 index 0000000..52dbb5f --- /dev/null +++ b/index.it_IT.html @@ -0,0 +1,389 @@ + + + + + + git-flow cheatsheet + + + + + + + + + + + +
                  + +

                  git-flow cheatsheet

                  + +

                  + creato da Daniel Kummer + + +

                  +

                  branching efficiente usando git-flow realizzato da Vincent Driessen

                  +

                  traduzioni: + English - + Castellano - + Brazilian Portugues - + 简体中文(Simplified Chinese) - + 日本語 - + Türkçe - + 한국어(Korean) - + Français - + Italiano +

                  +
                  + +
                  + + +
                  +

                  Introduzione

                  + +

                  + 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. + maggiori informazioni +

                  +

                  ★ ★ ★

                  + +

                  Questo cheatsheet mostra l'utilizzo di base a gli effetti dei comandi offerti da git-flow

                  + +

                  ★ ★ ★

                  +
                  + +
                  +

                  Consigli di base

                  +
                    +
                  • Git flow offre un eccelente guida e un ottimo output da linea di comando. Leggeteli attentamente per vedere cosa sta succedendo...
                    • +
                  • Il Client per OSX/Windows Sourcetree è un'eccellente GUI per git e offre supporto per git-flow +
                    • +
                  • Git-flow è una soluzione basata sul merge. Non esegue il rebase su i feature branch.
                    • +
                  +

                  ★ ★ ★

                  +
                  + + +
                  +

                  Setup

                  +
                    +
                  • È necessario un'installazione di git funzionante come prerequisito.
                    • +
                  • Git flow funziona su OSX, Linux e Windows
                    • +
                  +

                  ★ ★ ★

                  +
                  +

                  OSX

                  +
                  + $ brew 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 +
                  +

                  Sono necessari wget e util-linux per installare git-flow.

                  +
                  +
                  +

                  + Per le istruzioni dettagliate riguardo l'installazione di git-flow visitate il wiki di git flow. +

                  + install git-flow +
                  +
                  + +
                  +

                  Per Iniziare

                  +

                  Git flow ha la necessità di essere inizializzato per personalizzare il setup del progetto.

                  +

                  ★ ★ ★

                  +
                  +

                  Inizializzazione

                  + +

                  Iniziate ad utilizzare git-flow inizializzandolo all'interno di un repository git esistente:

                  +
                  + git flow init +
                  +

                  + Dovrete rispondere ad alcune domande riguardanti la naming conventions per i tuoi branch.
                  + Si raccomanda l'uso dei valori di default. +

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

                  Features (Funzionalità)

                  + +
                    +
                  • Sviluppare nuove features per le releases in arrivo
                    • +
                  • Generalmente sono presenti solo nei repository di sviluppo
                    • +
                  +

                  ★ ★ ★

                  + +
                  +

                  Iniziare una nuova feature

                  +

                  Lo sviluppo di nuove feature cominica dal branch 'develop'.

                  +

                  Iniziate lo sviluppo di una nuova feature con

                  +
                  + git flow feature start MYFEATURE +
                  +

                  Questa crea un nuovo feature branch basato su 'develop' e si sposta su quello

                  + + +
                  +
                  +
                  +
                  +
                  + +
                  +
                  +

                  Terminare una feature

                  + +

                  + Termina lo sviluppo di una feature. + Questa azione esegue le seguenti operazioni +

                  +
                    +
                  • Merge del branch MYFEATURE all'inteno di 'develop'
                    • +
                  • Rimuove il feature branch
                    • +
                  • Si sposta di nuovo sul branch 'develop'
                    • +
                  + +
                  + git flow feature finish MYFEATURE +
                  +
                  +
                  +
                  +
                  +
                  + +
                  +
                  +

                  Pubblicare una feature

                  + +

                  + State sviluppando una feature in collaborazione con altri?
                  + Pubblicate una feature sul server remoto in modo che possa essere utilizzata da altri utenti. +

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

                  Scaricare una feature pubblicata

                  + +

                  + Scaricare una feature pubblicata da un altro utente. +

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

                  Potete tracciare una feature sul repository origin usando git flow feature track MYFEATURE

                  +
                  +
                  +
                  +
                  +
                  + + +
                  +

                  Creare una release

                  + +
                    +
                  • Supporto alla preparazione di una nuova release di produzione
                    • +
                  • Consente di eseguire bug fixes minori e preparare i meta-dati per la release
                    • +
                  +

                  ★ ★ ★

                  +
                  +

                  Iniziare una release

                  + +

                  Per iniziare una release usate il comando release di git flow. Crea un release branch a partire dal branch 'develop'. +

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

                  Potere facoltativmente fornire come parametro [BASE] lo sha-1 hash del commit dal quale far partire la release. Il commit deve essere sul branch 'develop'.

                  +

                  ★ ★ ★

                  +

                  È 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:

                  +
                  + git flow release publish RELEASE +
                  +

                  (Potete tracciare la release remota con il comando git flow release track RELEASE)

                  +
                  +
                  +
                  +
                  +
                  + +
                  +
                  +

                  Terminare una release

                  + +

                  Terminare una release è uno dei passi più grandi nella gestione dei branch di git. Vengono eseguite svariate operazioni:

                  +
                    +
                  • Merge del release branch su branch 'master'
                    • +
                  • Tag della relase con il suo nome
                    • +
                  • Merge all'indietro della relase sul branch 'develop'
                    • +
                  • Rimozione del release branch
                    • +
                  +
                  + git flow release finish RELEASE +
                  +

                  Non dimenticate di fare il push dei tag creati con git push --tags

                  + +
                  +
                  +
                  + +
                  +
                  + +
                  +

                  Hotfixes

                  + +
                    +
                  • Gli Hotfixes nascono dalla necessità di agire immediatamente di fronte ad uno stato indesiderato della versione live di produzione.
                    • +
                  • Possono essere fatti partire dal tag corrispondente sul branch master che contrassegna la versione di produzione.
                    • +
                  +

                  ★ ★ ★

                  +
                  +

                  git flow hotfix start

                  + +

                  Come gli altri comandi di git flow, un hotfix comincia con

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

                  La versione passata come argomento definisce il nuovo nome dell'hotfix release. Facoltativamente potete specificare un basename da cui partire.

                  +
                  +
                  +
                  +
                  +
                  + +
                  +
                  +

                  Terminare un hotfix

                  + +

                  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.

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

                  Comandi

                  + git-flow commands +
                  + +
                  +

                  Backlog

                  +

                  ★ ★ ★

                  +
                    +
                  • Non tutti i comandi disponibili sono riportati qui, solo i più importanti
                    • +
                  • Potete comunque usare git e tutti i suoi comandi normalmente come li conoscete, git flow è solo una collezione di strumenti aggiuntivi. +
                    • +
                  • La funzionalità 'support' è ancora in beta, 'utilizzo non è consigliato
                    • +
                  • Se volete fornire una traduzione sarò felice di integrarla
                    • +
                  +

                  ★ ★ ★

                  +
                  +
                  + + + + + + + +comments powered by Disqus + + + + From a380347bf873284437b6fe4075ccc9dacee61e01 Mon Sep 17 00:00:00 2001 From: Andrea Mostosi Date: Sun, 20 Apr 2014 09:28:20 +0200 Subject: [PATCH 032/106] Update of translations index on other pages --- index.fr_FR.html | 7 ++++--- index.html | 7 ++++--- index.ja_JP.html | 7 ++++--- index.ko_KR.html | 7 ++++--- index.pt_BR.html | 7 ++++--- index.tr_TR.html | 7 ++++--- index.zh_CN.html | 7 ++++--- 7 files changed, 28 insertions(+), 21 deletions(-) diff --git a/index.fr_FR.html b/index.fr_FR.html index 8d17925..4201b89 100644 --- a/index.fr_FR.html +++ b/index.fr_FR.html @@ -52,9 +52,10 @@ Brazilian Portugues - 简体中文(Simplified Chinese) - 日本語 - - Türkçe - 한국어(Korean) - Français + Türkçe - + 한국어(Korean) - + Français - + Italiano

                  diff --git a/index.html b/index.html index 10d5499..64bae3a 100644 --- a/index.html +++ b/index.html @@ -52,9 +52,10 @@ Brazilian Portugues - 简体中文(Simplified Chinese) - 日本語 - - Türkçe - 한국어(Korean) - Français + Türkçe - + 한국어(Korean) - + Français - + Italiano

                  diff --git a/index.ja_JP.html b/index.ja_JP.html index 3463ad5..9b16634 100644 --- a/index.ja_JP.html +++ b/index.ja_JP.html @@ -52,9 +52,10 @@ Brazilian Portugues - 简体中文(Simplified Chinese) - 日本語 - - Türkçe - 한국어(Korean) - Français + Türkçe - + 한국어(Korean) - + Français - + Italiano

                  diff --git a/index.ko_KR.html b/index.ko_KR.html index 23fc407..d994d91 100644 --- a/index.ko_KR.html +++ b/index.ko_KR.html @@ -52,9 +52,10 @@ Brazilian Portugues - 简体中文(Simplified Chinese) - 日本語 - - Türkçe - 한국어(Korean) - Français + Türkçe - + 한국어(Korean) - + Français - + Italiano

                  diff --git a/index.pt_BR.html b/index.pt_BR.html index d2859c8..b347f38 100644 --- a/index.pt_BR.html +++ b/index.pt_BR.html @@ -52,9 +52,10 @@ Português Brasileiro - 简体中文(Simplified Chinese) - 日本語 - - Türkçe - 한국어(Korean) - Français + Türkçe - + 한국어(Korean) - + Français - + Italiano

                  diff --git a/index.tr_TR.html b/index.tr_TR.html index ea6142c..c2e2c75 100644 --- a/index.tr_TR.html +++ b/index.tr_TR.html @@ -51,9 +51,10 @@ Brazilian Portugues - 简体中文(Simplified Chinese) - 日本語 - - Türkçe - 한국어(Korean) - Français + Türkçe - + 한국어(Korean) - + Français - + Italiano

                  diff --git a/index.zh_CN.html b/index.zh_CN.html index 179a772..f8b5c1e 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -41,9 +41,10 @@ Brazilian Portugues - 简体中文(Simplified Chinese) 日本語 - - Türkçe - 한국어(Korean) - Français + Türkçe - + 한국어(Korean) - + Français - + Italiano

                  From 64abf779126746e4265d4ea97d6ac5dc5049cece Mon Sep 17 00:00:00 2001 From: Andrea Mostosi Date: Sun, 20 Apr 2014 09:29:45 +0200 Subject: [PATCH 033/106] CSS modification to handle long translations list --- css/style.css | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/css/style.css b/css/style.css index 91e896e..62ae5f1 100644 --- a/css/style.css +++ b/css/style.css @@ -14,7 +14,7 @@ header { box-shadow: 0px 5px 7px #8db7bd; -webkit-box-shadow: 0px 5px 7px #8db7bd; -moz-box-shadow: 0px 5px 7px #8db7bd; - height: 400px; + /*height: 400px;*/ background-color: #8db7bd; border-bottom: 1px solid #698b91 } @@ -112,6 +112,7 @@ blockquote { padding: 5px 20px; color: white; font-family: menlo, monospace; + word-wrap: break-word; } code { @@ -304,12 +305,10 @@ code { } #author { - width: 640px; - position: absolute; + width: 80%; top: 230px; - right: 15%; font-size: 20px; - text-align: right; + text-align: center; font-style: italic; color: #D92B00; z-index: 100; @@ -322,17 +321,16 @@ code { } #desc { - position: absolute; top: 300px; - width: 100%; + width: 90%; + text-align: center; } #translations { - position: absolute; top: 340px; - width: 100%; + width: 80%; right: 5%; - text-align: right; + text-align: center; } #translations .active { From c05dd859ba52a829e1292ed9a88e0a1aa2f52998 Mon Sep 17 00:00:00 2001 From: Andrea Mostosi Date: Sun, 20 Apr 2014 09:30:43 +0200 Subject: [PATCH 034/106] Translations index update also for ES --- index.es.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/index.es.html b/index.es.html index d23fbce..fc899a0 100644 --- a/index.es.html +++ b/index.es.html @@ -51,9 +51,10 @@ Castellano - Brazilian Portugues - 简体中文(Simplified Chinese) - - 日本語 - 한국어(Korean) - Français + 日本語 - + 한국어(Korean) - + Français - + Italiano

                  From 43bf915b7378de1ef82628a131f579d15cc499c9 Mon Sep 17 00:00:00 2001 From: Alexander Rothmund Date: Tue, 29 Apr 2014 09:31:26 +0200 Subject: [PATCH 035/106] Fix longer code blocks looking ugly --- css/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/css/style.css b/css/style.css index 62ae5f1..8489184 100644 --- a/css/style.css +++ b/css/style.css @@ -116,6 +116,7 @@ blockquote { } code { + display: inline-block; font-style: normal; padding-left: 5px; border-radius: 10px; From 20e37720fac92c13d097faf1a9eb721e446bf180 Mon Sep 17 00:00:00 2001 From: Arseniy Shapovalov Date: Mon, 7 Jul 2014 16:40:07 +0400 Subject: [PATCH 036/106] ru translate v0.01 --- index.ru_RU.html | 397 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 397 insertions(+) create mode 100644 index.ru_RU.html diff --git a/index.ru_RU.html b/index.ru_RU.html new file mode 100644 index 0000000..da73704 --- /dev/null +++ b/index.ru_RU.html @@ -0,0 +1,397 @@ + + + + + + git-flow cheatsheet + + + + + + + + + + + +
                  + +

                  Шпаргалка по git-flow

                  + +

                  + создал Daniel Kummer + + +

                  +

                  эффективное ветвление с помощью git-flow от Vincent Driessen

                  +

                  переводы: + English - + Castellano - + Brazilian Portugues - + 简体中文(Simplified Chinese) - + 日本語 - + Türkçe - + 한국어(Korean) - + Français - + Italiano + Russian +

                  +
                  + +
                  + + +
                  +

                  Введение

                  + +

                  + git-flow — это набор расширений git предоставляющий высокоуровневые операции над репозиторием для поддержки модели ветвления Vincent + Driessen. + узнать больше +

                  +

                  ★ ★ ★

                  + +

                  Эта шпаргалка показывает основные способы использования операций git-flow.

                  + +

                  ★ ★ ★

                  +
                  + +
                  +

                  Общие замечания

                  +
                    +
                  • 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

                  +
                  + $ brew 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 intallation 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 + + + + From a1a1653135da2dc3cf0736940539f7389b821d27 Mon Sep 17 00:00:00 2001 From: Arseniy Shapovalov Date: Tue, 8 Jul 2014 17:55:30 +0400 Subject: [PATCH 037/106] ru translate v0.02 --- index.ru_RU.html | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/index.ru_RU.html b/index.ru_RU.html index da73704..1567325 100644 --- a/index.ru_RU.html +++ b/index.ru_RU.html @@ -81,11 +81,10 @@

                  Общие замечания

                    -
                  • 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 предоставляет превосходную командную строку со справкой и улучшенными выводом. Внимательно читайте его, чтобы видеть, что происходит...
                    • +
                  • Клиент для OSX/Windows Sourcetree — отличный GUI для Git — также поддерживает git-flow
                    • -
                  • Git-flow is a merge based solution. It doesn't rebase feature branches.
                    • +
                  • Git-flow основана на слиянии. Для слияния ветвей фич не используется rebase.

                  ★ ★ ★

                  @@ -94,8 +93,8 @@

                  Setup

                    -
                  • You need a working git installation as prerequisite.
                    • -
                  • Git flow works on OSX, Linux and Windows
                    • +
                  • В первую очередь вам нужена рабочая установка git.
                    • +
                  • Git flow работает на OSX, Linux и Windows

                  ★ ★ ★

                  @@ -112,11 +111,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.

                  +

                  Вам потребуется wget и util-linux для установки git-flow.

                  - For detailed git flow intallation instructions please visit the git flow + Подробные инструкции по установке git flow смотрите на git flow wiki.

                  install git-flow @@ -124,19 +123,19 @@
                  -

                  Getting started

                  -

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

                  +

                  Приступая к работе

                  +

                  Git flow нужно инициализировать, чтобы настроить его для работы с вашим проектом.

                  ★ ★ ★

                  -

                  Initialize

                  - -

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

                  +

                  Инициализация

                  + +

                  Для начала использования git-flow проинициализируйте его внутри существующего 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. + Вам придётся ответить на несколько вопросов о способах именования ваших ветвей.
                  + Рекомендуется оставить значения по умолчанию.

                  @@ -150,18 +149,18 @@
                  -

                  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

                  +

                  Начало новой фичи

                  +

                  Разработка новых фич начинается из ветви "develop".

                  +

                  Для начала разработки фичи выполните:

                  git flow feature start MYFEATURE
                  From 65f6526c06ce0331fb45cc7e4d4910aa6999e8e0 Mon Sep 17 00:00:00 2001 From: Arseniy Shapovalov Date: Wed, 9 Jul 2014 12:44:00 +0400 Subject: [PATCH 038/106] ru translate v1.0 --- index.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.pt_BR.html | 1 + index.ru_RU.html | 119 +++++++++++++++++++++++++---------------------- index.tr_TR.html | 3 +- index.zh_CN.html | 3 +- 10 files changed, 80 insertions(+), 64 deletions(-) diff --git a/index.es.html b/index.es.html index fc899a0..0393e9a 100644 --- a/index.es.html +++ b/index.es.html @@ -54,7 +54,8 @@ 日本語 - 한국어(Korean) - Français - - Italiano + Italiano - + Русский (Russian)

                  diff --git a/index.fr_FR.html b/index.fr_FR.html index 4201b89..695f7e6 100644 --- a/index.fr_FR.html +++ b/index.fr_FR.html @@ -55,7 +55,8 @@ Türkçe - 한국어(Korean) - Français - - Italiano + Italiano - + Русский (Russian)

                  diff --git a/index.html b/index.html index 64bae3a..c51a766 100644 --- a/index.html +++ b/index.html @@ -55,7 +55,8 @@ Türkçe - 한국어(Korean) - Français - - Italiano + Italiano - + Русский (Russian)

                  diff --git a/index.it_IT.html b/index.it_IT.html index 52dbb5f..f35d234 100644 --- a/index.it_IT.html +++ b/index.it_IT.html @@ -55,7 +55,8 @@ Türkçe - 한국어(Korean) - Français - - Italiano + Italiano - + Русский (Russian)

                  diff --git a/index.ja_JP.html b/index.ja_JP.html index 9b16634..52f1350 100644 --- a/index.ja_JP.html +++ b/index.ja_JP.html @@ -55,7 +55,8 @@ Türkçe - 한국어(Korean) - Français - - Italiano + Italiano - + Русский (Russian)

                  diff --git a/index.ko_KR.html b/index.ko_KR.html index d994d91..c4cda7b 100644 --- a/index.ko_KR.html +++ b/index.ko_KR.html @@ -55,7 +55,8 @@ Türkçe - 한국어(Korean) - Français - - Italiano + Italiano - + Русский (Russian)

                  diff --git a/index.pt_BR.html b/index.pt_BR.html index b347f38..c8e8c04 100644 --- a/index.pt_BR.html +++ b/index.pt_BR.html @@ -56,6 +56,7 @@ 한국어(Korean) - Français - Italiano + Русский (Russian)

                  diff --git a/index.ru_RU.html b/index.ru_RU.html index 1567325..ddb2ca6 100644 --- a/index.ru_RU.html +++ b/index.ru_RU.html @@ -3,10 +3,19 @@ - git-flow cheatsheet - + Шпаргалка по git-flow + + + + + + @@ -47,7 +56,7 @@

                  эффективное ветвление с помощью git-flow от Vincent Driessen

                  переводы: - English - + English - Castellano - Brazilian Portugues - 简体中文(Simplified Chinese) - @@ -55,8 +64,8 @@ Türkçe - 한국어(Korean) - Français - - Italiano - Russian + Italiano - + Русский (Russian)

                  @@ -84,7 +93,7 @@
                • Git flow предоставляет превосходную командную строку со справкой и улучшенными выводом. Внимательно читайте его, чтобы видеть, что происходит...
                • Клиент для OSX/Windows Sourcetree — отличный GUI для Git — также поддерживает git-flow
                  • -
                • Git-flow основана на слиянии. Для слияния ветвей фич не используется rebase.
                  • +
                • Git-flow основана на слиянии. Для слияния веток фич не используется rebase.

                ★ ★ ★

                @@ -134,7 +143,7 @@ git flow init

                - Вам придётся ответить на несколько вопросов о способах именования ваших ветвей.
                + Вам придётся ответить на несколько вопросов о способах именования ваших веток.
                Рекомендуется оставить значения по умолчанию.

                @@ -159,12 +168,12 @@

                Начало новой фичи

                -

                Разработка новых фич начинается из ветви "develop".

                +

                Разработка новых фич начинается из ветки "develop".

                Для начала разработки фичи выполните:

                git flow feature start MYFEATURE
                -

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

                +

                Это действие создаёт новую ветку фичи, основанную на ветке "develop", и переключается на неё.

                +
                +
                +
                +
                +
                + +
                +
                +

                Het afronden van een feature

                + +

                + Rond de ontwikkeling van een feature af. + Deze actie voert de volgende stappen uit +

                +
                  +
                • Merge MYFEATURE in 'develop'
                  • +
                • Verwijdert de feature branch
                  • +
                • Schakelt terug naar de 'develop' branch
                  • +
                + +
                + git flow feature finish MYFEATURE +
                +
                +
                +
                +
                +
                + +
                +
                +

                Een feature publiceren

                + +

                + Ontwikkel je de feature samen met anderen?
                + Publiceer de feature branch dan naar de remote server zodat anderen deze branch ook kunnen gebruiken. +

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

                Een gepubliceerde feature ophalen

                + +

                + Haal een door een andere ontwikkelaar gepubliceerde feature op. +

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

                Je kan de wijzigingen op de feature bijhouden op de server door git flow feature track MYFEATURE uit te voeren

                +
                +
                +
                +
                +
                + + +
                +

                Een release maken

                + +
                  +
                • Ondersteunt de voorbereiding op een nieuwe productie release
                  • +
                • Staat kleine bugfixes toe en bereidt meta-data van een release voor
                  • +
                +

                ★ ★ ★

                +
                +

                Een release starten

                + +

                Om een release te starten, kun je het git flow release commando gebruiken. Dit

                + maakt een release branch aan gebaseerd op de 'develop' branch. +

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

                Je kan optioneel een [BASE] commit sha-1 hash toevoegen om de release hiervandaan te beginnen. Deze commit moet op de + 'develop' branch aanwezig zijn.

                +

                ★ ★ ★

                +

                Het is verstandig om de release branch te publiceren zodat andere ontwikkelaars hieraan kunnen meewerken. Dit lijkt op het publiceren van een feature branch:

                +
                + git flow release publish RELEASE +
                +

                (Je kan wijzigingen op de release branch bijhouden met het
                git flow release track RELEASE commando)

                +
                +
                +
                +
                +
                + +
                +
                +

                Een release afronden

                + +

                Een release afronden is een grote stap in git branchen. Het voert verschillende acties uit:

                +
                  +
                • De release branch wordt terug in 'master' gemerged
                  • +
                • De release wordt getagged met zijn naam
                  • +
                • De release wordt terug in 'develop' gemerged
                  • +
                • Verwijdert de release branch
                  • +
                +
                + git flow release finish RELEASE +
                +

                Vergeet niet je tags te pushen met git push --tags

                + +
                +
                +
                + +
                +
                + +
                +

                Hotfixes

                + +
                  +
                • Hotfixes ontstaan wanneer er onmiddellijk gehandeld moet worden na een bug in de live versie +
                  • +
                • Kan de corresponderende tag op de 'master' branch als basis hebben.
                  • +
                +

                ★ ★ ★

                +
                +

                git flow hotfix start

                + +

                Zoals andere git flow commando's, een hotfix wordt gestart door

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

                Het VERSION argument slaat op de nieuwe hotfix release naam. Optioneel kun je de BASENAME aangeven waarvandaan begonnen moet worden.

                +
                +
                +
                +
                +
                + +
                +
                +

                Een hotfix afronden

                + +

                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.

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

                Commando's

                + git-flow commands +
                + +
                +

                Backlog

                +

                ★ ★ ★

                +
                  +
                • Niet alle beschikbare commando's zijn hier behandeld, alleen de belangrijkste
                  • +
                • Je kan git en al zijn commando's gewoon blijven gebruiken daar git flow alleen een handig gereedschap is
                  • +
                • De 'support' feature is nog steeds in beta, het gebruik hiervan wordt niet geadviseerd
                  • +
                • Als je vertalingen wilt aanleveren, zal ik deze graag integreren
                  • +
                +

                ★ ★ ★

                +
                +
                + + + + + + + +comments powered by Disqus + + + + diff --git a/index.pt_BR.html b/index.pt_BR.html index c8e8c04..fcaa753 100644 --- a/index.pt_BR.html +++ b/index.pt_BR.html @@ -55,7 +55,8 @@ Türkçe - 한국어(Korean) - Français - - Italiano + Italiano - + Nederlands - Русский (Russian)

                diff --git a/index.tr_TR.html b/index.tr_TR.html index 10bcbcd..deadd02 100644 --- a/index.tr_TR.html +++ b/index.tr_TR.html @@ -48,13 +48,15 @@

                Vincent Driessen'ın verimli dallanma modeli kullanılarak tasarlanmıştır.

                çeviriler: English - + Castellano - Brazilian Portugues - 简体中文(Simplified Chinese) - 日本語 - - Türkçe - + Türkçe - 한국어(Korean) - Français - Italiano - + Nederlands - Русский (Russian)

                diff --git a/index.zh_CN.html b/index.zh_CN.html index 8cafb5f..2a466d0 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -39,12 +39,13 @@ English - Castellano - Brazilian Portugues - - 简体中文(Simplified Chinese) + 简体中文(Simplified Chinese) 日本語 - Türkçe - 한국어(Korean) - Français - Italiano - + Nederlands - Русский (Russian)

                From 6cb1193a4b3e9169a3c0fa3282e9dc3d4ee23d83 Mon Sep 17 00:00:00 2001 From: Barbery <380032007@qq.com> Date: Sat, 26 Jul 2014 17:41:52 +0800 Subject: [PATCH 041/106] describe the [BASENAME] Parameter describe the [BASENAME] Parameter --- index.zh_CN.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.zh_CN.html b/index.zh_CN.html index 2a466d0..cfe8544 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -280,7 +280,7 @@
                git flow hotfix start VERSION [BASENAME]
                -

                VERSION 参数标记着修正版本。你可以从 [BASENAME]开始

                +

                VERSION 参数标记着修正版本。你可以从 [BASENAME]开始，[BASENAME]为finish release时填写的版本号

                From 335cfee9bfaeb83ec127f7ccd835f7cb2285892a Mon Sep 17 00:00:00 2001 From: Rover12421 Date: Mon, 22 Sep 2014 12:58:22 +0800 Subject: [PATCH 042/106] Update index.zh_CN.html MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 错别字修改 --- index.zh_CN.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.zh_CN.html b/index.zh_CN.html index cfe8544..c850dce 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -322,7 +322,7 @@
              • 并非所有可用的命令都涵盖在这里，这里包含有最重要的部分命令。
              • 你依旧可以继续使用你所知道和了解的 git 命令， git flow 只是一个工具集合。
              • 'support' 功能只是测试版本, 不建议使用
                • -
              • 如何你乐意提供翻译，我很乐意整合它。
                • +
              • 如果你乐意提供翻译，我很乐意整合它。

              ★ ★ ★

              From 44859b7ca9b2240840ca77183ff37fceb829ae25 Mon Sep 17 00:00:00 2001 From: maekawa_yuichi Date: Wed, 24 Sep 2014 16:01:42 +0900 Subject: [PATCH 043/106] Changed to a better phrase. --- index.ja_JP.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.ja_JP.html b/index.ja_JP.html index 2f76962..2f2d4d3 100644 --- a/index.ja_JP.html +++ b/index.ja_JP.html @@ -344,7 +344,7 @@

              Backlog

              ★ ★ ★

                -
              • コマンドがすべてをカバーしているわけではなく、重要なものだけカバーしています。
                • +
              • コマンドのすべてをカバーしているわけではなく、重要なものだけカバーしています。
              • もちろん、gitのコマンドは通常通りすべて使用することができます。git flowは単にgitのコマンドの集合です。
              • 'support'ブランチの機能はまだベータ版です。それについては言及できません。
              • もし翻訳して頂けるなら、統合してもらえると幸いです。
                • From 2ef2a0fa9010ce6eaaab95210ff41f07a58a146d Mon Sep 17 00:00:00 2001 From: ronan-gloo Date: Tue, 21 Oct 2014 10:56:38 +0200 Subject: [PATCH 044/106] Add macport install instruction --- index.es.html | 5 +++++ index.fr_FR.html | 5 +++++ index.html | 5 +++++ index.it_IT.html | 5 +++++ index.ja_JP.html | 5 +++++ index.ko_KR.html | 5 +++++ index.nl_NL.html | 5 +++++ index.pt_BR.html | 5 +++++ index.ru_RU.html | 5 +++++ index.tr_TR.html | 5 +++++ index.zh_CN.html | 5 +++++ 11 files changed, 55 insertions(+) diff --git a/index.es.html b/index.es.html index 7490df3..9fa3729 100644 --- a/index.es.html +++ b/index.es.html @@ -100,9 +100,14 @@

                ★ ★ ★

                OSX

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

                Linux

                $ apt-get install git-flow diff --git a/index.fr_FR.html b/index.fr_FR.html index 7536a1e..4e2f3e5 100644 --- a/index.fr_FR.html +++ b/index.fr_FR.html @@ -99,9 +99,14 @@

                ★ ★ ★

                OSX

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

                Linux

                $ apt-get install git-flow diff --git a/index.html b/index.html index 4113958..92da849 100644 --- a/index.html +++ b/index.html @@ -101,9 +101,14 @@

                ★ ★ ★

                OSX

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

                Linux

                $ apt-get install git-flow diff --git a/index.it_IT.html b/index.it_IT.html index 845c7c1..f3b1398 100644 --- a/index.it_IT.html +++ b/index.it_IT.html @@ -100,9 +100,14 @@

                ★ ★ ★

                OSX

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

                Linux

                $ apt-get install git-flow diff --git a/index.ja_JP.html b/index.ja_JP.html index 2f2d4d3..a8760a6 100644 --- a/index.ja_JP.html +++ b/index.ja_JP.html @@ -98,9 +98,14 @@

                ★ ★ ★

                OSX

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

                Linux

                $ apt-get install git-flow diff --git a/index.ko_KR.html b/index.ko_KR.html index 80dd6a4..68ad631 100644 --- a/index.ko_KR.html +++ b/index.ko_KR.html @@ -98,9 +98,14 @@

                ★ ★ ★

                OSX

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

                Linux

                $ apt-get install git-flow diff --git a/index.nl_NL.html b/index.nl_NL.html index 57bc252..a42c613 100644 --- a/index.nl_NL.html +++ b/index.nl_NL.html @@ -100,9 +100,14 @@

                ★ ★ ★

                OSX

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

                Linux

                $ apt-get install git-flow diff --git a/index.pt_BR.html b/index.pt_BR.html index fcaa753..026fc13 100644 --- a/index.pt_BR.html +++ b/index.pt_BR.html @@ -101,9 +101,14 @@

                ★ ★ ★

                OSX

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

                Linux

                $ apt-get install git-flow diff --git a/index.ru_RU.html b/index.ru_RU.html index f463ce4..d0b41a8 100644 --- a/index.ru_RU.html +++ b/index.ru_RU.html @@ -108,9 +108,14 @@

                ★ ★ ★

                OSX

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

                Linux

                $ apt-get install git-flow diff --git a/index.tr_TR.html b/index.tr_TR.html index deadd02..72ac661 100644 --- a/index.tr_TR.html +++ b/index.tr_TR.html @@ -105,9 +105,14 @@

                ★ ★ ★

                OSX

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

                Linux

                $ apt-get install git-flow diff --git a/index.zh_CN.html b/index.zh_CN.html index c850dce..b66ee64 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -87,9 +87,14 @@

                ★ ★ ★

                OSX

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

                Linux

                $ apt-get install git-flow From fc7742a4884e4a047fd2db381a9c792cc2160b63 Mon Sep 17 00:00:00 2001 From: Axel Wehner Date: Sun, 2 Nov 2014 01:06:03 +0100 Subject: [PATCH 045/106] * Renamed Spanish language file to match the format of other filenames * Updated the language index menu for all pages --- index.es.html => index.es_ES.html | 0 index.fr_FR.html | 2 +- index.html | 2 +- index.it_IT.html | 2 +- index.ja_JP.html | 2 +- index.ko_KR.html | 2 +- index.nl_NL.html | 2 +- index.pt_BR.html | 2 +- index.ru_RU.html | 2 +- index.tr_TR.html | 2 +- index.zh_CN.html | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) rename index.es.html => index.es_ES.html (100%) diff --git a/index.es.html b/index.es_ES.html similarity index 100% rename from index.es.html rename to index.es_ES.html diff --git a/index.fr_FR.html b/index.fr_FR.html index 4e2f3e5..2b074fa 100644 --- a/index.fr_FR.html +++ b/index.fr_FR.html @@ -48,7 +48,7 @@

                modèle de versionnement efficace utilisant git-flow par Vincent Driessen

                traductions: English - - Castellano - + Castellano - Brazilian Portugues - 简体中文(Simplified Chinese) - 日本語 - diff --git a/index.html b/index.html index 92da849..e858f76 100644 --- a/index.html +++ b/index.html @@ -48,7 +48,7 @@

                efficient branching using git-flow by Vincent Driessen

                translations: English - - Castellano - + Castellano - Brazilian Portugues - 简体中文(Simplified Chinese) - 日本語 - diff --git a/index.it_IT.html b/index.it_IT.html index f3b1398..daedda3 100644 --- a/index.it_IT.html +++ b/index.it_IT.html @@ -48,7 +48,7 @@

                branching efficiente usando git-flow realizzato da Vincent Driessen

                traduzioni: English - - Castellano - + Castellano - Brazilian Portugues - 简体中文(Simplified Chinese) - 日本語 - diff --git a/index.ja_JP.html b/index.ja_JP.html index a8760a6..3c44bef 100644 --- a/index.ja_JP.html +++ b/index.ja_JP.html @@ -48,7 +48,7 @@

                efficient branching using git-flow by Vincent Driessen

                translations: English - - Castellano - + Castellano - Brazilian Portugues - 简体中文(Simplified Chinese) - 日本語 - diff --git a/index.ko_KR.html b/index.ko_KR.html index 68ad631..499fb96 100644 --- a/index.ko_KR.html +++ b/index.ko_KR.html @@ -48,7 +48,7 @@

                efficient branching using git-flow by Vincent Driessen

                translations: English - - Castellano - + Castellano - Brazilian Portugues - 简体中文(Simplified Chinese) - 日本語 - diff --git a/index.nl_NL.html b/index.nl_NL.html index a42c613..9235f73 100644 --- a/index.nl_NL.html +++ b/index.nl_NL.html @@ -48,7 +48,7 @@

                efficient branchen met behulp van git-flow door Vincent Driessen

                vertalingen: English - - Castellano - + Castellano - Brazilian Portugues - 简体中文(Simplified Chinese) - 日本語 - diff --git a/index.pt_BR.html b/index.pt_BR.html index 026fc13..172788e 100644 --- a/index.pt_BR.html +++ b/index.pt_BR.html @@ -48,7 +48,7 @@

                sistema de branches eficiente usando o git-flow, do Vincent Driessen

                traduções: English - - Castellano - + Castellano - Português Brasileiro - 简体中文(Simplified Chinese) - 日本語 - diff --git a/index.ru_RU.html b/index.ru_RU.html index d0b41a8..068c663 100644 --- a/index.ru_RU.html +++ b/index.ru_RU.html @@ -57,7 +57,7 @@

                эффективное ветвление с помощью git-flow от Vincent Driessen

                переводы: English - - Castellano - + Castellano - Brazilian Portugues - 简体中文(Simplified Chinese) - 日本語 - diff --git a/index.tr_TR.html b/index.tr_TR.html index 72ac661..cb2c0b4 100644 --- a/index.tr_TR.html +++ b/index.tr_TR.html @@ -48,7 +48,7 @@

                Vincent Driessen'ın verimli dallanma modeli kullanılarak tasarlanmıştır.

                çeviriler: English - - Castellano - + Castellano - Brazilian Portugues - 简体中文(Simplified Chinese) - 日本語 - diff --git a/index.zh_CN.html b/index.zh_CN.html index b66ee64..bc5b60a 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -37,7 +37,7 @@

                使用 git-flow 进行有效的分支实践。 by Vincent Driessen

                翻译: English - - Castellano - + Castellano - Brazilian Portugues - 简体中文(Simplified Chinese) 日本語 - From 919ae2addb96d09f918c80138c4f14a72726e291 Mon Sep 17 00:00:00 2001 From: Axel Wehner Date: Sun, 2 Nov 2014 02:15:40 +0100 Subject: [PATCH 046/106] * Added German Translation * Updated language index menu in all pages * Fixed HTML (Removed closing paragraph in index.html, line 264) --- index.de_DE.html | 433 +++++++++++++++++++++++++++++++++++++++++++++++ index.es_ES.html | 3 +- index.fr_FR.html | 3 +- index.html | 7 +- index.it_IT.html | 3 +- index.ja_JP.html | 3 +- index.ko_KR.html | 3 +- index.nl_NL.html | 3 +- index.pt_BR.html | 3 +- index.ru_RU.html | 3 +- index.tr_TR.html | 3 +- index.zh_CN.html | 3 +- 12 files changed, 456 insertions(+), 14 deletions(-) create mode 100644 index.de_DE.html diff --git a/index.de_DE.html b/index.de_DE.html new file mode 100644 index 0000000..d249391 --- /dev/null +++ b/index.de_DE.html @@ -0,0 +1,433 @@ + + + + + + git-flow cheatsheet + + + + + + + + + + +

                +
                + +

                git-flow Spickzettel

                + +

                + erstellt von Daniel Kummer + + +

                +

                Effizientes Branching mittels git-flow von Vincent Driessen

                +

                Übersetzungen: + English - + Castellano - + Brazilian Portugues - + 简体中文(Simplified Chinese) - + 日本語 - + Türkçe - + 한국어(Korean) - + Français - + Italiano - + Nederlands - + Русский (Russian) - + Deutsch (German) +

                +
                + +
                + + +
                +

                Über

                + +

                + git-flow ist ein Set aus Git-Erweiterungen, welches komplexe Repository-Arbeiten + nach Vincent Driessen's Branching-Modell ermöglicht. + mehr +

                +

                ★ ★ ★

                + +

                Dieser Spickzettel veranschaulicht die grundlegende Nutzung und den Ablauf von git-flow Operationen.

                + +

                ★ ★ ★

                +
                + +
                +

                Grundlegende Tipps

                +
                  +
                • 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.
                  • +
                • Der OSX/Windows Client SourceTree bietet ein exzellentes grafisches Interface und einfache Git-Flow Unterstützung.
                  • +
                • git-flow ist eine rein Merge-basierte Lösung (Zusammenführung). Es findet kein Rebasing der Feature-Branches (Entwicklungszweige) statt.
                  • +
                +

                ★ ★ ★

                +
                + + +
                +

                Einrichtung

                +
                  +
                • Du benötigst eine funktionierende Git Installation als Voraussetzung.
                  • +
                • git-flow läuft unter OSX, Linux und 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 +
                +

                Du benötigst wget und util-linux um git-flow zu installieren.

                +
                +
                +

                + Für eine detaillierte git-flow Installationsanleitung, besuche bitte das git flow + wiki. +

                + install git-flow +
                +
                + +
                +

                Erste Schritte

                +

                git-flow muss initalisiert werden, um das Projektsetup anzupassen.

                +

                ★ ★ ★

                +
                +

                Initialisierung

                + +

                Fange an mit git-flow zu arbeiten, indem Du es innerhalb eines bestehenden Git-Repository initialisierst:

                +
                + git flow init +
                +

                + Dabei musst Du einige Fragen bezueglich der Namenskoventionen Deiner Branches (Entwicklungszweige) beantworten.
                + Es wird empfohlen, die Standardwerte zu verwenden. +

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

                Features

                + +
                  +
                • Entwicklung neuer Features für bevorstehende Releases.
                  • +
                • In der Regel nur in Entwickler-Repositories zu finden.
                  • +
                +

                ★ ★ ★

                + +
                +

                Entwicklung neuer Features

                +

                Neue Features werden vom 'develop'-Branch abgeleitet.

                +

                Starte die Entwicklung eines neuen Features mittels

                +
                + git flow feature start MYFEATURE +
                +

                Dieser Befehl erstellt einen neuen Feature-Branch basierend auf 'develop' und wechselt in diesen.

                + + +
                +
                +
                +
                +
                + +
                +
                +

                Fertigstellung eines Features

                + +

                + Beende die Entwicklung eines Features. + Dies führt zu folgenden Aktionen: +

                +
                  +
                • Zusammenführen von MYFEATURE in den 'develop'-Branch (Merge-Prozess)
                  • +
                • Entfernt den Feature-Branch
                  • +
                • Wechselt zurück in den 'develop'-Branch
                  • +
                + +
                + git flow feature finish MYFEATURE +
                +
                +
                +
                +
                +
                + +
                +
                +

                Veröffentlichen eines Features

                + +

                + Entwickelst Du ein Feature in Zusammenarbeit?
                + Veröffentliche Dein Feature auf einem entfernten Server, + so dass es auch von anderen verfolgt werden kann. +

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

                Holen eines veröffentlichten Features

                + +

                + Hole ein Feature, welches von einem anderen Nutzer veröffentlicht wurde. +

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

                + Du kannst ein Feature unter Verwendung von +

                +
                git flow feature track MYFEATURE
                +

                + auf 'origin' verfolgen. +

                +
                +
                +
                +
                +
                + + +
                +

                Erstelle ein Release

                + +
                  +
                • Unterstützt die Fertigstellung einer Produktionsversion.
                  • +
                • Erlaubt geringfügige Bugfixes und die Erstellung der Metadaten für ein Release
                  • +
                +

                ★ ★ ★

                +
                +

                Beginne ein Release

                + +

                + Um ein neues Releases zu beginnen, benutze den git flow release Befehl. + Mit diesem wird ein Release-Branch vom aktuellen 'develop'-Branch erstellt. +

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

                + Du kannst optional einen [BASE] Commit sha-1 Hash bereitstellen, + um ein Release von diesem Commit zu starten. Der Commit muss sich im 'develop'-Branch befinden. +

                + +

                ★ ★ ★

                + +

                + 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: +

                +
                + git flow release publish RELEASE +
                +

                + (Du kannst ein entferntes Remote-Release mittels
                + git flow release track RELEASE verfolgen.) +

                +
                +
                +
                +
                +
                + +
                +
                +

                Fertigstellung eines Releases

                + +

                + Das Beenden eines Releases ist einer der größten Schritte im Git-Branching-Prozess. + Es bewirkt folgende Aktionen: +

                +
                  +
                • Zusammenführen des Release-Branches zurück in den 'master'-Branch. (Merge-Prozess)
                  • +
                • Markiert (Tagged) das Release mit seinem Namen
                  • +
                • Zurückführen des Releases in den 'develop'-Branch (Merge-Prozess)
                  • +
                • Entfernt den Release-Branch
                  • +
                +
                + git flow release finish RELEASE +
                +

                Vergesse nicht Deine Tags mittels git push --tags zu pushen.

                + +
                +
                +
                + +
                +
                + +
                +

                Hotfixes

                + +
                  +
                • + Hotfixes werden notwendig, sobald ein unerwünschter Zustand innerhalb einer Live-Produktionsversion + eintritt und resultierend daraus, sofort gehandelt werden muss. +
                  • +
                • + Ein Hotfix kann aus dem entsprechenden Tag des 'master'-Branches, welcher die Produktionsversion markiert, + direkt abgezweigt werden. +
                  • +
                +

                ★ ★ ★

                +
                +

                git flow hotfix start

                + +

                Ähnlich wie auch die anderen git-flow Befehle, wird ein Hotfix mittels

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

                + begonnen. Das VERSION-Argument markiert hierbei den neuen Hotfix-Release-Namen. + Optional kannst Du auch einen BASENAME spezifizieren. +

                + +
                +
                +
                +
                +
                + +
                +
                +

                Fertigstellung eines Hotfixes

                + +

                + 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. +

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

                Befehle

                + git-flow commands +
                + +
                +

                Backlog

                +

                ★ ★ ★

                +
                  +
                • Nicht alle verfügbaren Befehle sind hier abgedeckt, nur die wichtigsten.
                  • +
                • Du kannst weiterhin alle Git-Befehle normal nutzen, wie Du es gewohnt bist. Git-flow ist nur eine Werkzeugsammlung.
                  • +
                • Das 'support' Feature ist noch Beta und die Nutzung nicht empfohlen.
                  • +
                • Wenn Du Übersetzungen beisteuern möchtest, würde ich mich freuen diese zu integrieren.
                  • +
                +

                ★ ★ ★

                +
                +
                + + + + + + + +Kommentare powered by Disqus + + + + diff --git a/index.es_ES.html b/index.es_ES.html index 9fa3729..fedcc12 100644 --- a/index.es_ES.html +++ b/index.es_ES.html @@ -56,7 +56,8 @@ Français - Italiano - Nederlands - - Русский (Russian) + Русский (Russian) - + Deutsch (German)

                diff --git a/index.fr_FR.html b/index.fr_FR.html index 2b074fa..80e3396 100644 --- a/index.fr_FR.html +++ b/index.fr_FR.html @@ -57,7 +57,8 @@ Français - Italiano - Nederlands - - Русский (Russian) + Русский (Russian) - + Deutsch (German)

                diff --git a/index.html b/index.html index e858f76..4eeb9db 100644 --- a/index.html +++ b/index.html @@ -57,7 +57,8 @@ Français - Italiano - Nederlands - - Русский (Russian) + Русский (Russian) - + Deutsch (German)

                @@ -261,9 +262,7 @@

                Start a release

                -

                To start a release, use the git flow release command. It

                - creates a release branch created from the 'develop' branch. -

                +

                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]
                diff --git a/index.it_IT.html b/index.it_IT.html index daedda3..ab6fcc2 100644 --- a/index.it_IT.html +++ b/index.it_IT.html @@ -57,7 +57,8 @@ Français - Italiano - Nederlands - - Русский (Russian) + Русский (Russian) - + Deutsch (German)

                diff --git a/index.ja_JP.html b/index.ja_JP.html index 3c44bef..57ad112 100644 --- a/index.ja_JP.html +++ b/index.ja_JP.html @@ -57,7 +57,8 @@ Français - Italiano - Nederlands - - Русский (Russian) + Русский (Russian) - + Deutsch (German)

                diff --git a/index.ko_KR.html b/index.ko_KR.html index 499fb96..04aebe8 100644 --- a/index.ko_KR.html +++ b/index.ko_KR.html @@ -57,7 +57,8 @@ Français - Italiano - Nederlands - - Русский (Russian) + Русский (Russian) - + Deutsch (German)

                diff --git a/index.nl_NL.html b/index.nl_NL.html index 9235f73..4d3c843 100644 --- a/index.nl_NL.html +++ b/index.nl_NL.html @@ -56,7 +56,8 @@ 한국어(Korean) - Français - Italiano - - Nederlands + Nederlands - + Deutsch (German)

                diff --git a/index.pt_BR.html b/index.pt_BR.html index 172788e..cb6ce2c 100644 --- a/index.pt_BR.html +++ b/index.pt_BR.html @@ -57,7 +57,8 @@ Français - Italiano - Nederlands - - Русский (Russian) + Русский (Russian) - + Deutsch (German)

                diff --git a/index.ru_RU.html b/index.ru_RU.html index 068c663..0616b2c 100644 --- a/index.ru_RU.html +++ b/index.ru_RU.html @@ -65,7 +65,8 @@ 한국어(Korean) - Français - Italiano - - Русский (Russian) + Русский (Russian) - + Deutsch (German)

                diff --git a/index.tr_TR.html b/index.tr_TR.html index cb2c0b4..d7dc8d9 100644 --- a/index.tr_TR.html +++ b/index.tr_TR.html @@ -57,7 +57,8 @@ Français - Italiano - Nederlands - - Русский (Russian) + Русский (Russian) - + Deutsch (German)

                diff --git a/index.zh_CN.html b/index.zh_CN.html index bc5b60a..25c3a12 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -46,7 +46,8 @@ Français - Italiano - Nederlands - - Русский (Russian) + Русский (Russian) - + Deutsch (German)

                From 3edd560615bfbfdd71d518513809067af5e6ad26 Mon Sep 17 00:00:00 2001 From: tony Date: Fri, 7 Nov 2014 13:02:08 +0800 Subject: [PATCH 047/106] copy index file from index.zh_CN.html --- index.zh_TW.html | 364 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 364 insertions(+) create mode 100644 index.zh_TW.html diff --git a/index.zh_TW.html b/index.zh_TW.html new file mode 100644 index 0000000..25c3a12 --- /dev/null +++ b/index.zh_TW.html @@ -0,0 +1,364 @@ + + + + + + git-flow 备忘清单 + + + + + + + + + +
                + +

                git-flow 备忘清单

                + +

                + 由 Daniel Kummer (Tweet) 创建 + +

                +

                使用 git-flow 进行有效的分支实践。 by Vincent Driessen

                +

                翻译: + English - + Castellano - + Brazilian Portugues - + 简体中文(Simplified Chinese) + 日本語 - + Türkçe - + 한국어(Korean) - + Français - + Italiano - + Nederlands - + Русский (Russian) - + Deutsch (German) +

                +
                + +
                + + +
                +

                关于

                + +

                + git-flow 是一个 git 扩展集，按 Vincent Driessen 的分支模型提供高层次的库操作。 + 查看详情 +

                +

                ★ ★ ★

                + +

                这个备忘清单展示了 git-flow 的基本操作和效果。

                + +

                ★ ★ ★

                +
                + +
                +

                基础建议

                +
                  +
                • Git flow 提供了极出色的命令帮忙以及输出提示。请仔细阅读并观察发生了什么事情...
                  • +
                • OSX 程序 Sourcetree 是一个极出色的 git 界面客户端，已经提供了 git-flow 的支持。
                  • +
                • - Git-flow 是一个基于归并的解决方案，它并没有提供重置(rebase)特性分支的能力。
                  • +
                +

                ★ ★ ★

                +
                + + +
                +

                安装

                +
                  +
                • 你需要有一个可以工作的 git 作为前提。
                  • +
                • Git flow 可以工作在 OSX, Linux 和 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 +
                +

                安装 git-flow, 你需要 wget 和 util-linux。

                +
                +
                +

                + 更多的 git flow 安装指引，请阅读 git flow wiki. +

                + install git-flow +
                +
                + +
                +

                开始

                +

                为了自定义你的项目，Git flow 需要初始化过程。

                +

                ★ ★ ★

                +
                +

                初始化

                + +

                使用 git-flow，从初始化一个现有的 git 库内开始:

                +
                + git flow init +
                +

                + 你必须回答几个关于分支的命名约定的问题。
                建议使用默认值。 +

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

                特性

                + +
                  +
                • 为即将发布的版本开发新功能特性。
                  • +
                • 这通常只存在开发者的库中。
                  • +
                +

                ★ ★ ★

                + +
                +

                增加新特性

                +

                新特性的开发是基于 'develop' 分支的。

                +

                通过下面的命令开始开发新特性：

                +
                + git flow feature start MYFEATURE +
                +

                这个操作创建了一个基于'develop'的特性分支，并切换到这个分支之下。

                +
                +
                +
                +
                +
                + +
                +
                +

                完成新特性

                + +

                完成开发新特性。这个动作执行下面的操作. +

                +
                  +
                • 合并 MYFEATURE 分支到 'develop'
                  • +
                • 删除这个新特性分支
                  • +
                • 切换回 'develop' 分支
                  • +
                + +
                + git flow feature finish MYFEATURE +
                +
                +
                +
                +
                +
                + +
                +
                +

                发布新特性

                + +

                + 你是否合作开发一项新特性？
                + 发布新特性分支到远程服务器，所以，其它用户也可以使用这分支。 +

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

                取得一个发布的新特性分支

                + +

                + 取得其它用户发布的新特性分支，并签出远程的变更。 +

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

                作一个release版本

                + +
                  +
                • 支持一个新的用于生产环境的发布版本。
                  • +
                • 允许修正小问题，并为发布版本准备元数据。
                  • +
                +

                ★ ★ ★

                +
                +

                开始准备release版本

                + +

                开始准备release版本，使用 git flow release 命令.

                + 它从 'develop' 分支开始创建一个 release 分支。 +

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

                你可以选择提供一个 [BASE]参数，即提交记录的 sha-1 hash 值，来开启动 release 分支. 这个提交记录的 sha-1 hash 值必须是'develop' 分支下的。

                +

                ★ ★ ★

                +

                创建 release 分支之后立即发布允许其它用户向这个 release 分支提交见容是个明智的做法。命令十分类似发布新特性：

                +
                + git flow release publish RELEASE +
                +

                (你可以通过
                git flow release track RELEASE 命令签出 release 版本的远程变更)

                +
                +
                +
                +
                +
                + +
                +
                +

                完成 release 版本

                + +

                完成 release 版本是一个大 git 分支操作。它执行下面几个动作：

                +
                  +
                • 归并 release 分支到 'master' 分支
                  • +
                • 用 release 分支名打 Tag
                  • +
                • 归并 release 分支到 'develop'
                  • +
                • 移除 release 分支
                  • +
                +
                + git flow release finish RELEASE +
                +
                +
                +
                + +
                +
                + +
                +

                热点修复

                + +
                  +
                • 热点修复来自这样的需求：生产环境的版本处于一个不预期状态，需要立即修正。
                  • +
                • 有可能是需要修正 master 分支上某个 TAG 标记的生产版本。
                  • +
                +

                ★ ★ ★

                +
                +

                开始 git flow 热点修复

                + +

                像其它 git flow 命令一样, 热点修复分支开始自：

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

                VERSION 参数标记着修正版本。你可以从 [BASENAME]开始，[BASENAME]为finish release时填写的版本号

                +
                +
                +
                +
                +
                + +
                +
                +

                完成热点修复

                + +

                当完成热点分支，代码归并回 develop 和 master 分支。相应地，master 分支打上修正版本的 TAG。

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

                命令

                + git-flow commands +
                + +
                +

                Backlog

                +

                ★ ★ ★

                +
                  +
                • 并非所有可用的命令都涵盖在这里，这里包含有最重要的部分命令。
                  • +
                • 你依旧可以继续使用你所知道和了解的 git 命令， git flow 只是一个工具集合。
                  • +
                • 'support' 功能只是测试版本, 不建议使用
                  • +
                • 如果你乐意提供翻译，我很乐意整合它。
                  • +
                +

                ★ ★ ★

                +
                +
                + + + + + + +comments powered by Disqus + + + From 8420a848786d21d0f54e376be9b40dbc3a3d4f5e Mon Sep 17 00:00:00 2001 From: tony Date: Sat, 8 Nov 2014 01:25:01 +0800 Subject: [PATCH 048/106] finish translate to getting started --- index.zh_TW.html | 55 ++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/index.zh_TW.html b/index.zh_TW.html index 25c3a12..3c57684 100644 --- a/index.zh_TW.html +++ b/index.zh_TW.html @@ -1,9 +1,9 @@ - + - git-flow 备忘清单 + git-flow 備忘清單 @@ -28,18 +28,19 @@
                -

                git-flow 备忘清单

                +

                git-flow 備忘清單

                - 由 Daniel Kummer (Tweet) 创建 + 由 Daniel Kummer (Tweet) 建立

                -

                使用 git-flow 进行有效的分支实践。 by Vincent Driessen

                -

                翻译: +

                使用 git-flow 進行高效率的分支使用。 by Vincent Driessen

                +

                翻譯: English - Castellano - Brazilian Portugues - - 简体中文(Simplified Chinese) + 繁體中文(Traditional Chinese) - + 简体中文(Simplified Chinese)
                日本語 - Türkçe - 한국어(Korean) - @@ -55,44 +56,44 @@

                -

                关于

                +

                什麼是 git-flow ?

                - git-flow 是一个 git 扩展集，按 Vincent Driessen 的分支模型提供高层次的库操作。 - 查看详情 + git-flow 是一個 git 擴充功能，依照 Vincent Driessen 的分支模型提供高層次的倉庫控制方式。 + 查看更多

                ★ ★ ★

                -

                这个备忘清单展示了 git-flow 的基本操作和效果。

                +

                這個備忘清單將會為您展示 git-flow 的基本操作方式與結果。

                ★ ★ ★

                -

                基础建议

                +

                基礎建議

                  -
                • Git flow 提供了极出色的命令帮忙以及输出提示。请仔细阅读并观察发生了什么事情...
                  • -
                • OSX 程序 Sourcetree 是一个极出色的 git 界面客户端，已经提供了 git-flow 的支持。
                  • -
                • - Git-flow 是一个基于归并的解决方案，它并没有提供重置(rebase)特性分支的能力。
                  • +
                • Git flow 提供了極為出色的指令與輸出提示。請仔細閱讀並觀察發生了什麼事情...
                  • +
                • SourceTree 是一個極為出色的 git 圖形介面應用程式，以內建了 git-flow 的功能。(支援 Mac OS X 與 Windows)
                  • +
                • Git-flow 是一個以歸並(Merge)為基底的解決方案，它並無提供重置(rebase)特性分支的功能。

                ★ ★ ★

                -

                安装

                +

                安裝

                  -
                • 你需要有一个可以工作的 git 作为前提。
                  • -
                • Git flow 可以工作在 OSX, Linux 和 Windows之下
                  • +
                • 你需要有一個已經初始化的 git 倉庫。
                  • +
                • Git flow 可以在 OSX, Linux 和 Windows 之下使用。

                ★ ★ ★

                -

                OSX

                - Homebrew +

                Mac OS X

                + 透過 Homebrew 安裝
                $ brew install git-flow
                - Macports + 透過 Macports 安裝
                $ port install git-flow
                @@ -105,29 +106,29 @@ $ wget -q -O - --no-check-certificate https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | bash
                -

                安装 git-flow, 你需要 wget 和 util-linux。

                +

                在 Windows 下安装 git-flow, 你會需要 wget 和 util-linux。

                - 更多的 git flow 安装指引，请阅读 git flow wiki. + 更詳細的 git flow 安裝指南，請參閱 git flow wiki.

                install git-flow
                -

                开始

                -

                为了自定义你的项目，Git flow 需要初始化过程。

                +

                開始 git flow

                +

                在開始使用 git flow 之前，你必須完成一些簡單的設定。

                ★ ★ ★

                初始化

                -

                使用 git-flow，从初始化一个现有的 git 库内开始:

                +

                開始使用 git-flow 前，你必須切換目錄至你的 git 專案中，並且以下列指令進行初始化:

                git flow init

                - 你必须回答几个关于分支的命名约定的问题。
                建议使用默认值。 + 接著您必須回答幾個問題，是關於分支名稱的定義。
                這裡建議使用預設值。

                From 8df1afe36e355d911f1381e924c9b610e72a3dac Mon Sep 17 00:00:00 2001 From: tony Date: Sat, 8 Nov 2014 01:51:49 +0800 Subject: [PATCH 049/106] translate to new feature --- index.zh_TW.html | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/index.zh_TW.html b/index.zh_TW.html index 3c57684..0c88cb5 100644 --- a/index.zh_TW.html +++ b/index.zh_TW.html @@ -142,22 +142,22 @@
                -

                特性

                +

                新功能分支

                  -
                • 为即将发布的版本开发新功能特性。
                  • -
                • 这通常只存在开发者的库中。
                  • +
                • 為接下即將發佈的版本開發新功能時使用。
                  • +
                • 通常新功能分支只會存於開發者機器上。

                ★ ★ ★

                -

                增加新特性

                -

                新特性的开发是基于 'develop' 分支的。

                -

                通过下面的命令开始开发新特性：

                +

                開始新功能設計

                +

                新功能的開發是由 'develop' 分支的最後一個版本發展出來的。

                +

                使用下列的命令可以開始一個新功能的分支：

                git flow feature start MYFEATURE
                -

                这个操作创建了一个基于'develop'的特性分支，并切换到这个分支之下。

                +

                這個命令將會於 'develop' 的最後一個版本建立出另一個 'feature/MYFEATURE' 分支，並自動切換至這個分支底下。現在你可以開始製作新功能。

                @@ -166,19 +166,19 @@
                -

                完成新特性

                +

                完成新功能

                -

                完成开发新特性。这个动作执行下面的操作. +

                當你在新功能分支完成新功能後，使用下列指令來結束新功能開發:

                -
                  -
                • 合并 MYFEATURE 分支到 'develop'
                  • -
                • 删除这个新特性分支
                  • -
                • 切换回 'develop' 分支
                  • -
                -
                git flow feature finish MYFEATURE
                +

                這個指令會替你完成下列動作: +

                  +
                • 合並(Merge) MYFEATURE 分支回到 'develop'
                  • +
                • 刪除這個新功能分支
                  • +
                • 切換回 'develop' 分支
                  • +
                @@ -187,11 +187,11 @@
                -

                发布新特性

                +

                發佈新功能分支

                - 你是否合作开发一项新特性？
                - 发布新特性分支到远程服务器，所以，其它用户也可以使用这分支。 + 你是否需多人合作開發新功能？
                + 透過下列命令來發佈新功能分支到遠端 git 伺服器，讓其他使用者也能共用這個新功能分支。

                @@ -205,10 +205,10 @@
                -

                取得一个发布的新特性分支

                +

                取得新功能分支

                - 取得其它用户发布的新特性分支，并签出远程的变更。 + 當你需接手完成新功能時，透過下列命令取得遠端伺服器上的新功能分支，並得到所有保存在遠端伺服器上的變更紀錄：

                From a9c455c1d98663edbb5bad85ba7710398aefc1d6 Mon Sep 17 00:00:00 2001 From: tony Date: Sat, 8 Nov 2014 02:00:53 +0800 Subject: [PATCH 050/106] add track translate --- index.zh_TW.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/index.zh_TW.html b/index.zh_TW.html index 0c88cb5..f651baf 100644 --- a/index.zh_TW.html +++ b/index.zh_TW.html @@ -214,6 +214,14 @@
                git flow feature pull MYFEATURE
                + +

                + 你也可以透過下列指令進而追蹤一個功能: +

                + +
                + git flow feature track MYFEATURE +
                @@ -222,7 +230,7 @@
                -

                作一个release版本

                +

                製作一個 release 版本

                • 支持一个新的用于生产环境的发布版本。
                  • From bc9685c1114287cd4d46c93c4aa1d861d4c229ab Mon Sep 17 00:00:00 2001 From: tony Date: Sat, 8 Nov 2014 02:19:29 +0800 Subject: [PATCH 051/106] translate to start release --- index.zh_TW.html | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/index.zh_TW.html b/index.zh_TW.html index f651baf..85419df 100644 --- a/index.zh_TW.html +++ b/index.zh_TW.html @@ -233,26 +233,27 @@

                  製作一個 release 版本

                    -
                  • 支持一个新的用于生产环境的发布版本。
                    • -
                  • 允许修正小问题，并为发布版本准备元数据。
                    • +
                  • 用於支援準備發佈正式產品前的預備分支。
                    • +
                  • 允許修正小問題，並為發布版本準備或修改中介資料。

                  ★ ★ ★

                  -

                  开始准备release版本

                  +

                  開始 release

                  -

                  开始准备release版本，使用 git flow release 命令.

                  - 它从 'develop' 分支开始创建一个 release 分支。 -

                  +

                  使用下列指令準備 release 分支:

                  git flow release start RELEASE [BASE]
                  -

                  你可以选择提供一个 [BASE]参数，即提交记录的 sha-1 hash 值，来开启动 release 分支. 这个提交记录的 sha-1 hash 值必须是'develop' 分支下的。

                  +

                  + 它會從 'develop' 分支的最後一個版本創建出 release 分支。 +

                  +

                  你也可以選擇性的加入一個 sha-1 hash 於[BASE]參數，這會讓 release 分支於您指定的 develop 提交紀錄點產生分支。有一點需要注意的是，sha-1 has 只能是於'develop' 分支下。

                  ★ ★ ★

                  -

                  创建 release 分支之后立即发布允许其它用户向这个 release 分支提交见容是个明智的做法。命令十分类似发布新特性：

                  +

                  最佳的狀況下，在創建出新的 release 分支後，應要立即的發布至遠端伺服器上，讓其他團隊中的開發者也能存取這個 release 分支。而這個發布指令很類似於發布新功能:

                  git flow release publish RELEASE
                  -

                  (你可以通过
                  git flow release track RELEASE 命令签出 release 版本的远程变更)

                  +

                  (您也可以透過
                  git flow release track RELEASE 指令來取得 release 版本的遠端更改)

                  From 96cc039c0a55203e1e3d8ec4a048089d535a2cd6 Mon Sep 17 00:00:00 2001 From: tony Date: Sat, 8 Nov 2014 09:13:09 +0800 Subject: [PATCH 052/106] finish translate 'finish release' --- index.zh_TW.html | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/index.zh_TW.html b/index.zh_TW.html index 85419df..9574121 100644 --- a/index.zh_TW.html +++ b/index.zh_TW.html @@ -238,9 +238,9 @@

                ★ ★ ★

                -

                開始 release

                +

                開始推出新版本

                -

                使用下列指令準備 release 分支:

                +

                使用下列指令準備推出(release)新版本分支:

                git flow release start RELEASE [BASE]
                @@ -262,18 +262,19 @@
                -

                完成 release 版本

                +

                完成推出新版本

                -

                完成 release 版本是一个大 git 分支操作。它执行下面几个动作：

                -
                  -
                • 归并 release 分支到 'master' 分支
                  • -
                • 用 release 分支名打 Tag
                  • -
                • 归并 release 分支到 'develop'
                  • -
                • 移除 release 分支
                  • -
                +

                完成 release 版本是一個很大的 git 分支操作。但你只許要執行下列指令:

                git flow release finish RELEASE
                +

                git flow 會幫你執行下面幾個步驟:

                +
                  +
                • 合並 release 分支到 'master'
                  • +
                • 在 master 加上版本號標籤(Tag)
                  • +
                • 合並 release 分支到 'develop'
                  • +
                • 移除 release 分支
                  • +
                From 69face8981b3518dc00831de2a388fffcf8d0415 Mon Sep 17 00:00:00 2001 From: tony Date: Sat, 8 Nov 2014 15:41:03 +0800 Subject: [PATCH 053/106] finish translate to 'finish hotfix' --- index.zh_TW.html | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/index.zh_TW.html b/index.zh_TW.html index 9574121..02a9b8f 100644 --- a/index.zh_TW.html +++ b/index.zh_TW.html @@ -283,21 +283,22 @@
                -

                热点修复

                +

                快速修復

                  -
                • 热点修复来自这样的需求：生产环境的版本处于一个不预期状态，需要立即修正。
                  • -
                • 有可能是需要修正 master 分支上某个 TAG 标记的生产版本。
                  • +
                • 當你的產品發佈環境處於不可預期的狀況，且發生了一些需要立即修正的問題，您可以使用 hotfix 來幫助您。
                  • +
                • hotfix 是從 master 中加入的版本標籤開始。

                ★ ★ ★

                -

                开始 git flow 热点修复

                +

                開始快速修復

                -

                像其它 git flow 命令一样, 热点修复分支开始自：

                +

                快速修復(hotfix)就像其他的 git flow 指令一樣，您可以透過下列指令開始：

                git flow hotfix start VERSION [BASENAME]
                -

                VERSION 参数标记着修正版本。你可以从 [BASENAME]开始，[BASENAME]为finish release时填写的版本号

                +

                你必須填寫一個 VERSION 參數，這代表當你完成 hotfix 時發佈的版本號碼。

                +

                此外你可以自由挑選修復開始的分支名稱[BASENAME]，分支名稱如果不填寫的狀況下，預設是 'master'。

                @@ -306,9 +307,9 @@
                -

                完成热点修复

                +

                完成快速修復

                -

                当完成热点分支，代码归并回 develop 和 master 分支。相应地，master 分支打上修正版本的 TAG。

                +

                當你在快速修復分支完成修復後，透過下列的指令讓修復分支合並回 develop 和 master 分支。並且在 master 分支加上修訂版本號的標籤(tag):

                git flow hotfix finish VERSION
                From fb4e02ec33088107fdc525232b988e9a0d9dc21c Mon Sep 17 00:00:00 2001 From: tony Date: Sat, 8 Nov 2014 17:26:55 +0800 Subject: [PATCH 054/106] finish base translate --- index.zh_TW.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/index.zh_TW.html b/index.zh_TW.html index 02a9b8f..d51eac2 100644 --- a/index.zh_TW.html +++ b/index.zh_TW.html @@ -329,18 +329,18 @@
                -

                命令

                +

                指令一覽圖

                git-flow commands
                -

                Backlog

                +

                備註

                ★ ★ ★

                  -
                • 并非所有可用的命令都涵盖在这里，这里包含有最重要的部分命令。
                  • -
                • 你依旧可以继续使用你所知道和了解的 git 命令， git flow 只是一个工具集合。
                  • -
                • 'support' 功能只是测试版本, 不建议使用
                  • -
                • 如果你乐意提供翻译，我很乐意整合它。
                  • +
                • 這裡我們只介紹了重要且常用的功能，並非包含所有的指令。
                  • +
                • 安裝了 git flow 後你依然可以使用你所知道的 git 指令，git flow 只是一個擴充功能。
                  • +
                • 'support' 分支目前為測試版本不建議使用。
                  • +
                • 如果你很樂意提供翻譯，我很樂意整合在這裡。

                ★ ★ ★

                @@ -350,7 +350,7 @@
                -

                Comments

                +

                建議與回應

                @@ -368,7 +368,7 @@ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); })(); -
                -

                Вам потребуется wget и util-linux для установки git-flow.

                +

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

                - Подробные инструкции по установке git flow смотрите на git flow + For detailed git flow intallation instructions please visit the git flow wiki.

                install git-flow @@ -139,19 +133,19 @@
                -

                Приступая к работе

                -

                Git flow нужно инициализировать, чтобы настроить его для работы с вашим проектом.

                +

                Getting started

                +

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

                ★ ★ ★

                -

                Инициализация

                +

                Initialize

                -

                Для начала использования git-flow проинициализируйте его внутри существующего git-репозитория:

                +

                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.

                @@ -165,22 +159,22 @@
                -

                Фичи

                +

                Features

                  -
                • Разработка новых фич для последующих релизов
                  • -
                • Обычно присутствует только в репозиториях разработчиков
                  • +
                • Develop new features for upcoming releases
                  • +
                • Typically exist in developers repos only

                ★ ★ ★

                -

                Начало новой фичи

                -

                Разработка новых фич начинается из ветки "develop".

                -

                Для начала разработки фичи выполните:

                +

                Start a new feature

                +

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

                +

                Start developing a new feature with

                git flow feature start MYFEATURE
                -

                Это действие создаёт новую ветку фичи, основанную на ветке "develop", и переключается на неё.

                +

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

                @@ -166,14 +194,16 @@
                -

                完成新特性

                +

                Finish up a feature

                -

                完成开发新特性。这个动作执行下面的操作. +

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

                  -
                • 合并 MYFEATURE 分支到 'develop'
                  • -
                • 删除这个新特性分支
                  • -
                • 切换回 'develop' 分支
                  • +
                • Merged MYFEATURE into 'develop'
                  • +
                • Removes the feature branch
                  • +
                • Switches back to 'develop' branch
                @@ -187,11 +217,11 @@
                -

                发布新特性

                +

                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.

                @@ -205,15 +235,17 @@
                -

                取得一个发布的新特性分支

                +

                Getting a published feature

                - 取得其它用户发布的新特性分支，并签出远程的变更。 + Get a feature published by another user.

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

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

                @@ -222,29 +254,29 @@
                -

                作一个release版本

                +

                Make a release

                  -
                • 支持一个新的用于生产环境的发布版本。
                  • -
                • 允许修正小问题，并为发布版本准备元数据。
                  • +
                • Support preparation of a new production release
                  • +
                • Allow for minor bug fixes and preparing meta-data for a release

                ★ ★ ★

                -

                开始准备release版本

                +

                Start a release

                -

                开始准备release版本，使用 git flow release 命令.

                - 它从 'develop' 分支开始创建一个 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]
                -

                你可以选择提供一个 [BASE]参数，即提交记录的 sha-1 hash 值，来开启动 release 分支. 这个提交记录的 sha-1 hash 值必须是'develop' 分支下的。

                +

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

                ★ ★ ★

                -

                创建 release 分支之后立即发布允许其它用户向这个 release 分支提交见容是个明智的做法。命令十分类似发布新特性：

                +

                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
                -

                (你可以通过
                git flow release track RELEASE 命令签出 release 版本的远程变更)

                +

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

                @@ -253,18 +285,20 @@
                -

                完成 release 版本

                +

                Finish up a release

                -

                完成 release 版本是一个大 git 分支操作。它执行下面几个动作：

                +

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

                  -
                • 归并 release 分支到 'master' 分支
                  • -
                • 用 release 分支名打 Tag
                  • -
                • 归并 release 分支到 'develop'
                  • -
                • 移除 release 分支
                  • +
                • 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

                +
                @@ -273,21 +307,22 @@
                -

                热点修复

                +

                Hotfixes

                  -
                • 热点修复来自这样的需求：生产环境的版本处于一个不预期状态，需要立即修正。
                  • -
                • 有可能是需要修正 master 分支上某个 TAG 标记的生产版本。
                  • +
                • 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 热点修复

                +

                git flow hotfix start

                -

                像其它 git flow 命令一样, 热点修复分支开始自：

                +

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

                git flow hotfix start VERSION [BASENAME]
                -

                VERSION 参数标记着修正版本。你可以从 [BASENAME]开始，[BASENAME]为finish release时填写的版本号

                +

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

                @@ -296,9 +331,9 @@
                -

                完成热点修复

                +

                Finish a hotfix

                -

                当完成热点分支，代码归并回 develop 和 master 分支。相应地，master 分支打上修正版本的 TAG。

                +

                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
                @@ -318,7 +353,7 @@
                -

                命令

                +

                Commands

                git-flow commands
                @@ -326,10 +361,12 @@

                Backlog

                ★ ★ ★

                  -
                • 并非所有可用的命令都涵盖在这里，这里包含有最重要的部分命令。
                  • -
                • 你依旧可以继续使用你所知道和了解的 git 命令， git flow 只是一个工具集合。
                  • -
                • 'support' 功能只是测试版本, 不建议使用
                  • -
                • 如果你乐意提供翻译，我很乐意整合它。
                  • +
                • 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

                ★ ★ ★

                @@ -344,6 +381,7 @@
      +

      -

      efficient branching using git-flow by Vincent Driessen

      -

      translations: - English - +

      modèle de versionnement efficace utilisant git-flow par Vincent Driessen

      +

      traductions: + English - Castellano - Brazilian Portugues - 繁體中文(Traditional Chinese) - @@ -55,7 +55,7 @@ 日本語 - Türkçe - 한국어(Korean) - - Français - + Français - Italiano - Nederlands - Русский (Russian) - @@ -68,38 +68,36 @@

      -

      About

      +

      A propos

      - git-flow are a set of git extensions to provide high-level repository operations for Vincent - Driessen's branching model. - more + 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. + détails

      ★ ★ ★

      -

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

      +

      Cet aide-mémoire montre l'utilisation et les effets des opérations git-flow

      ★ ★ ★

      -

      Basic tips

      +

      Conseils de base

        -
      • 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 +
      • Les commandes et sorties de Git-flow apportent une aide précieuse. Lisez les attentivement pour comprendre ce qui se passe...
        • +
      • Le logiciel pour OSX Sourcetree est une excellente interface graphique pour git qui supporte git-flow.
        • -
      • Git-flow is a merge based solution. It doesn't rebase feature branches.
        • +
      • Git-flow est une solution basée sur les fusions (merge). Elle n'effectue pas de rebase sur les branches de fonctionnalitées

      ★ ★ ★

      -

      Setup

      +

      Installation

        -
      • You need a working git installation as prerequisite.
        • -
      • Git flow works on OSX, Linux and Windows
        • +
      • Une installation fonctionnelle de git est requise
        • +
      • Git flow fonctionne sur OSX, Linux et Windows

      ★ ★ ★

      @@ -121,31 +119,31 @@ $ 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.

      +

      Vous aurez besoin de wget et de util-linux pour installer git-flow.

      - For detailed git flow intallation instructions please visit the git flow - wiki. + Pour des instructions détaillées concernant l'installation de git-flow, consultez le + wiki git-flow.

      install git-flow
      -

      Getting started

      -

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

      +

      Premiers pas

      +

      Git flow doit être initialisé afin de personnaliser la configuration de votre projet.

      ★ ★ ★

      -

      Initialize

      +

      Initialisation

      -

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

      +

      Commencez à utiliser git-flow en l'initialisant dans un dépot git existant:

      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. + Vous devrez répondre à quelques questions concernant les conventions de nommage pour vos branches.
      + Il est recommandé d'utiliser les valeurs par défaut.

      @@ -153,28 +151,28 @@
      -
      +
    -

    Features

    +

    Fonctionnalités/Features

      -
    • Develop new features for upcoming releases
      • -
    • Typically exist in developers repos only
      • +
    • Developpe des nouvelles fonctionnalités pour la prochaine version
      • +
    • Existe en général uniquement dans les dépots des développeurs

    ★ ★ ★

    -

    Start a new feature

    -

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

    -

    Start developing a new feature with

    +

    Commencer une feature

    +

    Le développement d'une fonctionnalité commence à partir de la branche 'develop'

    +

    Commencer le développement d'une nouvelle fonctionnalité avec:

    git flow feature start MYFEATURE
    -

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

    +

    Cette commande crée une nouvelle branche de fonctionnalité basée sur 'develop' et passe sur cette branche

    +

    Esse comando cria um novo branch da funcionalidade baseado no 'develop' e alterna para ele

    @@ -194,16 +183,16 @@
    -

    Finish up a feature

    +

    Finalizar uma funcionalidade

    - Finish the development of a feature. - This action performs the following + Finaliza o desenvolvimento de uma funcionalidade. + Esse comando faz o seguinte

      -
    • Merged MYFEATURE into 'develop'
      • -
    • Removes the feature branch
      • -
    • Switches back to 'develop' branch
      • +
    • Mescla MYFEATURE no 'develop'
      • +
    • Remove o branch da funcionalidade
      • +
    • Volta para o branch 'develop'
    @@ -217,11 +206,12 @@
    -

    Publish a feature

    +

    Publicar uma funcionalidade

    - Are you developing a feature in collaboration?
    - Publish a feature to the remote server so it can be used by other users. + Você está desenvolvendo uma funcionalidade colaborativamente?
    + Publique uma funcionalidade para o servidor remoto, assim ela pode ser + utilizada por outros usuários.

    @@ -235,17 +225,16 @@
    -

    Getting a published feature

    +

    Obter uma funcionalidade publicada

    - Get a feature published by another user. + Obtenha uma funcionalidade publicada por outro usuário e acompanhe + as alterações remotas.

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

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

    @@ -254,29 +243,31 @@
    -

    Make a release

    +

    Criar uma versão/release

      -
    • Support preparation of a new production release
      • -
    • Allow for minor bug fixes and preparing meta-data for a release
      • +
    • Auxilia a preparação de uma nova versão de produção
      • +
    • Permite correções de bugs menores e a preparação de metadados de uma versão

    ★ ★ ★

    -

    Start a release

    +

    Começar uma versão

    -

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

    +

    Para começar uma versão, use o comando git flow release. Ele
    + cria um branch da versão baseado no branch 'develop'. +

    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.

    +

    Você pode opcionalmente fornecer um hash sha-1 do commit [BASE] de onde começar a versão. O + commit precisa estar no branch 'develop'

    ★ ★ ★

    -

    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:

    +

    É 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:

    git flow release publish RELEASE
    -

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

    +

    (Você pode acompanhar uma versão remota com o comando
    git flow release track RELEASE)

    @@ -285,20 +276,18 @@
    -

    Finish up a release

    +

    Finalizar uma versão

    -

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

    +

    A finalização de uma versão é um dos grandes passos na ramificação/branching do git. Ele executa várias ações:

      -
    • Merges the release branch back into 'master'
      • -
    • Tags the release with its name
      • -
    • Back-merges the release into 'develop'
      • -
    • Removes the release branch
      • +
    • Mescla o branch da versão no 'master'
      • +
    • Etiqueta a versão com seu nome
      • +
    • Mescla o branch da versão de volta no 'develop'
      • +
    • Remove o branch da versão
    git flow release finish RELEASE
    -

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

    -
    @@ -307,22 +296,21 @@
    -

    Hotfixes

    +

    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.
      • +
    • Os hotfixes surgem da necessidade de agir imediatamente sobre uma situação indesejada na versão de produção ativa
      • +
    • Pode ser criado a partir da tag correspondente no branch master que indica a versão em produção.

    ★ ★ ★

    git flow hotfix start

    -

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

    +

    Assim como os outros comandos do git flow, um hotfix inicia com

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

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

    +

    O argumento release nesse caso marca a versão defeituosa na produção

    @@ -331,11 +319,11 @@
    -

    Finish a hotfix

    +

    Finalizar um hotfix

    -

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

    +

    Ao finalizar um hotfix ele é mesclado tanto no develop quanto no master. Além disso, o merge no master é etiquetado.

    - git flow hotfix finish VERSION + git flow hotfix finish RELEASE
    @@ -353,7 +341,7 @@
    -

    Commands

    +

    Comandos

    git-flow commands
    @@ -361,12 +349,11 @@

    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
      • +
    • Nem todos os comandos disponíveis estão cobertos aqui, apenas os mais importantes deles
      • +
    • Você pode continuar a usar o git e todos os comandos dele normalmente como você já conhece, o git flow + é apenas uma coleção de ferramentas
      • +
    • A funcionalidade 'support' continua no estágio beta, seu uso não é indicado
      • +
    • Se você quiser fornecer traduções, ficarei feliz de integrá-las

    ★ ★ ★

    @@ -376,7 +363,7 @@
    -

    Comments

    +

    Comentários

    @@ -395,9 +382,9 @@ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); })(); -
    -

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

    +

    Вам потребуется wget и util-linux для установки git-flow.

    - For detailed git flow intallation instructions please visit the git flow + Подробные инструкции по установке git flow смотрите на git flow wiki.

    install git-flow @@ -133,19 +140,19 @@
    -

    Getting started

    -

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

    +

    Приступая к работе

    +

    Git flow нужно инициализировать, чтобы настроить его для работы с вашим проектом.

    ★ ★ ★

    -

    Initialize

    +

    Инициализация

    -

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

    +

    Для начала использования git-flow проинициализируйте его внутри существующего 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. + Вам придётся ответить на несколько вопросов о способах именования ваших веток.
    + Рекомендуется оставить значения по умолчанию.

    @@ -159,22 +166,22 @@
    -

    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

    +

    Начало новой фичи

    +

    Разработка новых фич начинается из ветки "develop".

    +

    Для начала разработки фичи выполните:

    git flow feature start MYFEATURE
    -

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

    +

    Это действие создаёт новую ветку фичи, основанную на ветке "develop", и переключается на неё.

    +
    +
    +
    +
    +
    + +
    +
    +

    Finalizare funcționalitate

    + +

    + Încheie dezvoltarea unei funcționalități. + Această acțiune execută următoarele operații +

    +
      +
    • Face merge al branch-ului MYFEATURE în 'develop'
      • +
    • Șterge branch-ul de tip funcționalitate
      • +
    • Se mută înapoi pe branch-ul 'develop'
      • +
    + +
    + git flow feature finish MYFEATURE +
    +
    +
    +
    +
    +
    + +
    +
    +

    Publicare funcționalitate

    + +

    + Dezvolți funcționalitate în colaborare cu altcineva?
    + Publică-ți funcționalitatea pe server, ca ea să poată fi folosită și de alți utilizatori. +

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

    Obținerea unei funcționalități publicate

    + +

    + Obține funcționalitate publicată de către un alt utilizator. +

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

    Poți urmări o funcționalitate la repository-ul origine folosind git flow feature track MYFEATURE

    +
    +
    +
    +
    +
    + + +
    +

    Predare/Release

    + +
      +
    • Ajută la pregătirea unui nou release în producție
      • +
    • Permite fixarea unor probleme minore, precum și pregătirea meta-datelor asociate unui release
      • +
    +

    ★ ★ ★

    +
    +

    Începere release

    + +

    Pentru a începe un release nou, folosește comanda git flow release. Aceasta crează un nou branch de tip release bazat pe branch-ul 'develop'.

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

    Este posibilă furnizarea unei [BAZE] sha-1 de commit pentru a fi folosit drept bază a release-ului ce se crează. Acest commit trebuie să existe pe branch-ul 'develop'.

    +

    ★ ★ ★

    +

    Este înțelept a publica branch-ul de release după ce a fost creat, pentru a permite și altor programatori să contribuie. Acest proces este similar celui de publicare funcționalitate; se folosește comanda:

    +
    + git flow release publish RELEASE +
    +

    (Poți urmări un release cu comanda
    git flow release track RELEASE)

    +
    +
    +
    +
    +
    + +
    +
    +

    Finalizare release

    + +

    Finalizarea unui release este unul din cei mai importanți pași din lucrul cu branch-urile în git. Se efectuează câteva acțiuni:

    +
      +
    • Merge al branch-ului release înapoi în 'master'
      • +
    • Crează tag (etichetă) pentru release, cu numele acestuia
      • +
    • Merge al release-ului în branch-ul 'develop'
      • +
    • Șterge branch-ul de release
      • +
    +
    + git flow release finish RELEASE +
    +

    Nu uita să publici etichetele cu comanda git push --tags

    + +
    +
    +
    + +
    +
    + +
    +

    Corecturi/Hotfixes

    + +
      +
    • Corecturile provin din necesitatea de a acționa cât mai curând asupra unei stări nedorite a unei versiuni deja livrate
      • +
    • Se poate baza pe eticheta de pe branch-ul master corespunzătoare release-ului țintit.
      • +
    +

    ★ ★ ★

    +
    +

    Începere corectură

    + +

    Asemeni celorlalte comezi git flow, o corectură se începe cu

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

    Argumentul VERSION markează noul nume de release ce va fi atribuit corecturii. În mod opțional poți preciza un nume de bază de la care se va porni în crearea corecturii.

    +
    +
    +
    +
    +
    + +
    +
    +

    Finalizare corectură

    + +

    Prin finalizarea unei corecturi, aceasta va fi merge-uită înapoi în branch-urile 'develop' și 'master'. Suplimentar, 'master' va fi etichetat cu versiunea corecturii.

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

    Comenzi

    + git-flow commands +
    + +
    +

    Rezerve

    +

    ★ ★ ★

    +
      +
    • Nu toate comenzile disponibile sunt acoperite aici, ci doar cele mai importante
      • +
    • Poți folosi în continuare git și toate comenzile sale în mod normal, așa cum le cunoști, deoarece git flow + este doar o colecție de instrumente suplimentare +
      • +
    • Facilitatea de 'support' este încă în beta, de aceea folosirea sa nu este recomandată
      • +
    • Dacă dorești să ajuti la traducere, voi fi fericit să le integrez
      • +
    +

    ★ ★ ★

    +
    +
    + + + + + + + +comentarii cu sprijinul Disqus + + + + diff --git a/index.ru_RU.html b/index.ru_RU.html index f9e5166..48ffc2b 100644 --- a/index.ru_RU.html +++ b/index.ru_RU.html @@ -68,7 +68,8 @@ Italiano - Русский (Russian) - Deutsch (German) - - Català (Catalan) + Català (Catalan) - + Română (Romanian)

    diff --git a/index.tr_TR.html b/index.tr_TR.html index c9c9954..bb5ba28 100644 --- a/index.tr_TR.html +++ b/index.tr_TR.html @@ -60,7 +60,8 @@ Nederlands - Русский (Russian) - Deutsch (German) - - Català (Catalan) + Català (Catalan) - + Română (Romanian)

    diff --git a/index.zh_CN.html b/index.zh_CN.html index a786f78..e4b0491 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -47,7 +47,8 @@ Italiano - Nederlands - Русский (Russian) - - Deutsch (German) + Deutsch (German) - + Română (Romanian)

    diff --git a/index.zh_TW.html b/index.zh_TW.html index 2a8b800..650e312 100644 --- a/index.zh_TW.html +++ b/index.zh_TW.html @@ -50,7 +50,8 @@ Nederlands - Русский (Russian) - Deutsch (German) - - Català (Catalan) + Català (Catalan) - + Română (Romanian)

    From 286bfe07e9f6cf309dd6e2989f6574e6b4f39c20 Mon Sep 17 00:00:00 2001 From: Merianos Nikos Date: Fri, 5 Jun 2015 14:18:28 +0300 Subject: [PATCH 077/106] Greek language file --- index.ca_CA.html | 3 +- index.de_DE.html | 3 +- index.el_GR.html | 427 +++++++++++++++++++++++++++++++++++++++++++++++ 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.pt_BR.html | 3 +- index.ro_RO.html | 3 +- index.ru_RU.html | 3 +- index.tr_TR.html | 3 +- index.zh_CN.html | 3 +- index.zh_TW.html | 3 +- 16 files changed, 457 insertions(+), 15 deletions(-) create mode 100644 index.el_GR.html diff --git a/index.ca_CA.html b/index.ca_CA.html index 3fc8e9d..e94ad12 100644 --- a/index.ca_CA.html +++ b/index.ca_CA.html @@ -62,7 +62,8 @@ Русский (Russian) - Deutsch (German) - Català (Catalan) - - Română (Romanian) + Română (Romanian) - + Ελληνικά (Greek)

    diff --git a/index.de_DE.html b/index.de_DE.html index a21d625..be5cb4b 100644 --- a/index.de_DE.html +++ b/index.de_DE.html @@ -61,7 +61,8 @@ Русский (Russian) - Deutsch (German) - Català (Catalan) - - Română (Romanian) + Română (Romanian) - + Ελληνικά (Greek)

    diff --git a/index.el_GR.html b/index.el_GR.html new file mode 100644 index 0000000..10e6a2e --- /dev/null +++ b/index.el_GR.html @@ -0,0 +1,427 @@ + + + + + + git-flow Φύλλο αναφοράς + + + + + + + + + + + +
    + +

    git-flow Φύλλο αναφοράς

    + +

    + δημιουργήθηκε από τον Daniel Kummer + + +

    +

    αποτελεσματικές διακλαδώσεις χρησιμοποιώντας το git-flow του 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) +

    +
    + +
    + + +
    +

    Σχετικά

    + +

    + git-flow είναι ένα σύνολο από επεκτάσεις για το git που παρέχουν υψηλού επιπέδου λειτουργίες σε εν + αποθετήρια για το μοντέλο διακλαδώσεων του Vincent + Driessen's. + λεπτομέρειες +

    +

    ★ ★ ★

    + +

    Αυτό το φύλλο αναφοράς, παρουσιάζει την βασική χρήση και τα αποτελέσματα των λειτουργιών του git-flow

    + +

    ★ ★ ★

    +
    + +
    +

    Βασικές συμβουλές

    +
      +
    • Το Git flow παρέχει εξαιρετική βοήθεια στην γραμμή εντολών και στην έξοδο. Διαβάστε προσεκτικά για να + δείτε τι συμβαίνει... +
      • +
    • Το τερματικό Sourcetree για OSX/Windows είναι ένα εξαιρετικό + γραφικό περιβάλλων εργασίας για git και παρέχει υποστήριξη για το git flow +
      • +
    • Git-flow είναι μια λύση βασισμένη στο πάντρεμα (merge). Δεν αναπροσαρμόζει διακλαδώσεις + χαρακτηριστικών. +
      • +
    +

    ★ ★ ★

    +
    + + +
    +

    Εγκατάσταση

    +
      +
    • Είναι προϋπόθεση να έχετε ήδη εγκατεστημένο το git στον υπολογιστή σας.
      • +
    • Το Git flow λειτουργεί σε OSX, Linux και 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 +
    +

    Χρειάζεστε το wget και το util-linux για να εγκαταστήσετε το install git-flow.

    +
    +
    +

    + Για αναλυτικές οδηγίες εγκατάστασης του git flow παρακαλώ επισκεφτείτε το + git flow wiki. +

    + install git-flow +
    +
    + +
    +

    Αρχίζοντας

    + +

    Το Git flow πρέπει να προετοιμαστεί, ώστε να προσαρμόσει τις ρυθμίσεις του έργου σας.

    + +

    ★ ★ ★

    + +
    +

    Προετοιμασία

    + +

    Αρχίστε να χρησιμοποιείτε το git-flow προετοιμάζοντας το, μέσα σε ένα git εν-αποθετήριο (git repository):

    +
    + git flow init +
    +

    + Θα πρέπει να απαντήσετε μερικές ερωτήσεις σχετικά με τους κανόνες ονοματοδοσίας για τις διακλαδώσεις.
    + Συνιστάτε η χρήση των τιμών που προτείνονται. +

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

    Χαρακτηριστικά

    + +
      +
    • Δημιουργήστε νέα χαρακτηριστικά για επερχόμενες εκδώσεις
      • +
    • Τυπικά υπάρχει μόνο στα εν-αποθετήρια των προγραμματιστών
      • +
    +

    ★ ★ ★

    + +
    +

    Αρχίστε ένα νέο χαρακτηριστικό

    + +

    Η δημιουργία ενός νέου χαρακτηριστικού αρχίζει (δημιουργείται) από την διακλάδωση 'develop'

    + +

    Αρχίστε την δημιουργία νέου χαρακτηριστικού με την εντολή

    +
    + git flow feature start MYFEATURE +
    +

    Αυτή η ενέργεια δημιουργεί μια νέα διακλάδωση για νέο χαρακτηριστικό βασισμένη στην διακλάδωση 'develop' και μεταπήδηση στην νέα διακλάδωση

    + + +
    +
    +
    +
    +
    + +
    +
    +

    Ολοκληρώστε την δημιουργία ενός νέου χαρακτηριστικού.

    + +

    + Αυτή η ενέργεια κάνει τα ακόλουθα +

    +
      +
    • Παντρεύει το MYFEATURE στο'develop'
      • +
    • Αφαιρεί την διακλάδωση που δημιουργήθηκε για το νέο χαρακτηριστικό
      • +
    • Μεταπηδά ξανά στην διακλάδωση 'develop'
      • +
    + +
    + git flow feature finish MYFEATURE +
    +
    +
    +
    +
    +
    + +
    +
    +

    Δημοσιεύστε ένα χαρακτηριστικό

    + +

    + Παράγετε ένα χαρακτηριστικό της εφαρμογής σας σε συνεργασία με άλλους προγραμματιστές;
    + Δημοσιεύστε το χαρακτηριστικό σας στον απομακρυσμένο server, ώστε να μπορούν οι άλλοι προγραμματιστές να το χρησιμοποιήσουν. +

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

    Πάρτε ένα δημοσιευμένο χαρακτηριστικό

    + +

    + Πάρτε ένα δημοσιευμένο χαρακτηριστικό από τον απομακρυσμένο server που το δημοσίευσε κάποιος άλλος προγραμματιστής. +

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

    Μπορείτε να παρακολουθείτε ένα χαρακτηριστικό στον απομακρυσμένο server (origin) χρησιμοποιώντας την εντολή git flow feature track MYFEATURE

    +
    +
    +
    +
    +
    + + +
    +

    Δημιουργήστε μια νέα έκδοση

    + +
      +
    • Υποστηρίζει την προετοιμασία μια έκδοσης για παραγωγή
      • +
    • Επιτρέπει μικρής σημασίας επιδιορθώσεις σφαλμάτων και προετοιμάζει τα μέτα-δεδομένα για την έκδοση
      • +
    +

    ★ ★ ★

    + +
    +

    Αρχίστε μια έκδοση

    + +

    Για να αρχίσετε μια νέα έκδοση, χρησιμοποιήστε την εντολή του git flow, release. Η εντολή αυτή δημιουργεί μια νέα διακλάδωση, από την διακλάδωση 'develop'

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

    Μπορείτε προαιρετικά να εισάγετε ως [BASE] το sha-1 hash ενός commit για να αρχίσετε την νέα έκδοση το συγκεκριμένο commit. Το commit + πρέπει να είναι στην διακλάδωση 'develop'.

    + +

    ★ ★ ★

    + +

    Είναι σοφό να δημοσιεύσετε την διακλάδωση έκδοσης, μετά την δημιουργία της, ώστε να επιτρέψετε commits έκδοσης από άλλους προγραμματιστές. + Μπορείτε να το κάνετε αυτό, με τον ίδιο τρόπο που δημοσιεύεται τα νέα χαρακτηριστικά, με την εντολή:

    +
    + git flow release publish RELEASE +
    +

    (Μπορείτε να παρακολουθείτε απομακρυσμένες εκδόσεις με την εντολή
    git flow release track RELEASE)

    +
    +
    +
    +
    +
    + +
    +
    +

    Ολοκληρώνοντας μια νέα έκδοση

    + +

    Η ολοκλήρωση μιας νέας έκδοσης είναι ένα από τα μεγάλα βήματα στις διακλαδώσεις του git γιατί γίνονται πολλές ενέργειες μαζί:

    +
      +
    • Παντρεύει την διακλάδωση της έκδοσης με την διακλάδωση 'master'
      • +
    • Βάζει την ετικέτα στην έκδοση με το όνομα της
      • +
    • Παντρεύει την έκδοση με την διακλάδωση 'develop'
      • +
    • Διαγράψει την διακλάδωση της έκδοσης
      • +
    +
    + git flow release finish RELEASE +
    +

    Μην ξεχάσετε να σπρώξετε τις ετικέτες σας με την εντολή git push --tags

    + +
    +
    +
    + +
    +
    + +
    +

    Άμεσες επιδιορθώσεις (Hotfixes)

    + +
      +
    • + Οι άμεσες επιδιορθώσεις προκύπτουν από την ανάγκη της άμεσης επέμβασης σε μια ανεπιθύμητη κατάσταση της τρέχουσας έκδοσης στο λογισμικό παραγωγής. +
      • +
    • + Μπορεί η νέα διακλάδωση να δημιουργηθεί από την αντίστοιχη ετικέτα στην κεντρική (master) διακλάδωση που χαρακτηρίζει την έκδοση παραγωγής. +
      • +
    +

    ★ ★ ★

    + +
    +

    git flow hotfix start

    + +

    Όπως και οι άλλες εντολές του git flow, μία άμεση επιδιόρθωση αρχίζει με

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

    Η επιλογή VERSION, χαρακτηρίζει το όνομα της νέας άμεσης επιδιόρθωσης. Προαιρετικά μπορείτε να ορίσετε ένα όνομα βάσης για να αρχίσετε από εκεί.

    +
    +
    +
    +
    +
    + +
    +
    +

    Ολοκληρώνοντας μία άμεση επιδιόρθωση

    + +

    + Με την ολοκλήρωση μιας άμεσης επιδιόρθωσης, η διακλάδωση παντρεύεται με την διακλάδωση develop και master. + Επιπλέον η κεντρική διακλάδωση (master) αποκτά την ετικέτα του ονόματος της άμεσης επιδιόρθωσης. +

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

    Εντολές

    + git-flow commands +
    + +
    +

    Σημειώσεις

    + +

    ★ ★ ★

    +
      +
    • Εδώ δεν καλύπτονται όλες οι διαθέσιμες εντολές, αλλά μόνο οι ποιο σημαντικές
      • +
    • Μπορείτε να συνεχίσετε την χρήση του git και όλες τις εντολές του κανονικά όπως τις γνωρίζεται, το git flow είναι απλά μια συλλογή με εργαλεία.
      • +
    • Το χαρακτηριστικό 'support' είναι ακόμα σε κατάσταση beta, δεν σας συμβουλεύουμε να το χρησιμοποιήσετε
      • +
    • Αν σας αρέσει να παρέχετε μεταφράσεις, θα είναι χαρά μου να τις ενσωματώσω
      • +
    +

    ★ ★ ★

    +
    +
    + + + + + + +τα σχόλια παρέχονται από το Disqus + + diff --git a/index.es_ES.html b/index.es_ES.html index d442065..16beac7 100644 --- a/index.es_ES.html +++ b/index.es_ES.html @@ -60,7 +60,8 @@ Русский (Russian) - Deutsch (German) - Català (Catalan) - - Română (Romanian) + Română (Romanian) - + Ελληνικά (Greek)

    diff --git a/index.fr_FR.html b/index.fr_FR.html index 9645e1e..36d3a8b 100644 --- a/index.fr_FR.html +++ b/index.fr_FR.html @@ -61,7 +61,8 @@ Русский (Russian) - Deutsch (German) - Català (Catalan) - - Română (Romanian) + Română (Romanian) - + Ελληνικά (Greek)

    diff --git a/index.html b/index.html index e09085d..8c8da2c 100644 --- a/index.html +++ b/index.html @@ -61,7 +61,8 @@ Русский (Russian) - Deutsch (German) - Català (Catalan) - - Română (Romanian) + Română (Romanian) - + Ελληνικά (Greek)

    diff --git a/index.it_IT.html b/index.it_IT.html index 0a3577b..17e09b0 100644 --- a/index.it_IT.html +++ b/index.it_IT.html @@ -61,7 +61,8 @@ Русский (Russian) - Deutsch (German) - Català (Catalan) - - Română (Romanian) + Română (Romanian) - + Ελληνικά (Greek)

    diff --git a/index.ja_JP.html b/index.ja_JP.html index ef2dfb4..8125044 100644 --- a/index.ja_JP.html +++ b/index.ja_JP.html @@ -61,7 +61,8 @@ Русский (Russian) - Deutsch (German) - Català (Catalan) - - Română (Romanian) + Română (Romanian) - + Ελληνικά (Greek)

    diff --git a/index.ko_KR.html b/index.ko_KR.html index bdf14b6..e88edda 100644 --- a/index.ko_KR.html +++ b/index.ko_KR.html @@ -61,7 +61,8 @@ Русский (Russian) - Deutsch (German) - Català (Catalan) - - Română (Romanian) + Română (Romanian) - + Ελληνικά (Greek)

    diff --git a/index.nl_NL.html b/index.nl_NL.html index f630d83..45bb20a 100644 --- a/index.nl_NL.html +++ b/index.nl_NL.html @@ -60,7 +60,8 @@ Nederlands - Deutsch (German) - Català (Catalan) - - Română (Romanian) + Română (Romanian) - + Ελληνικά (Greek)

    diff --git a/index.pt_BR.html b/index.pt_BR.html index a29b2db..bd2b408 100644 --- a/index.pt_BR.html +++ b/index.pt_BR.html @@ -61,7 +61,8 @@ Русский (Russian) - Deutsch (German) - Català (Catalan) - - Română (Romanian) + Română (Romanian) - + Ελληνικά (Greek)

    diff --git a/index.ro_RO.html b/index.ro_RO.html index 44fc5bf..ce26e7d 100644 --- a/index.ro_RO.html +++ b/index.ro_RO.html @@ -61,7 +61,8 @@ Русский (Russian) - Deutsch (German) - Català (Catalan) - - Română (Romanian) + Română (Romanian) - + Ελληνικά (Greek)

    diff --git a/index.ru_RU.html b/index.ru_RU.html index 48ffc2b..2ab4b1e 100644 --- a/index.ru_RU.html +++ b/index.ru_RU.html @@ -69,7 +69,8 @@ Русский (Russian) - Deutsch (German) - Català (Catalan) - - Română (Romanian) + Română (Romanian) - + Ελληνικά (Greek)

    diff --git a/index.tr_TR.html b/index.tr_TR.html index bb5ba28..aad68ff 100644 --- a/index.tr_TR.html +++ b/index.tr_TR.html @@ -61,7 +61,8 @@ Русский (Russian) - Deutsch (German) - Català (Catalan) - - Română (Romanian) + Română (Romanian) - + Ελληνικά (Greek)

    diff --git a/index.zh_CN.html b/index.zh_CN.html index e4b0491..e56359e 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -48,7 +48,8 @@ Nederlands - Русский (Russian) - Deutsch (German) - - Română (Romanian) + Română (Romanian) - + Ελληνικά (Greek)

    diff --git a/index.zh_TW.html b/index.zh_TW.html index 650e312..bb12b16 100644 --- a/index.zh_TW.html +++ b/index.zh_TW.html @@ -51,7 +51,8 @@ Русский (Russian) - Deutsch (German) - Català (Catalan) - - Română (Romanian) + Română (Romanian) - + Ελληνικά (Greek)

    From 068935540665054d153b841807d37d8a8184875c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Corr=C3=AAa=20Gomes?= Date: Thu, 25 Jun 2015 22:49:11 -0300 Subject: [PATCH 078/106] Update index.pt_BR.html --- index.pt_BR.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.pt_BR.html b/index.pt_BR.html index bd2b408..64df60a 100644 --- a/index.pt_BR.html +++ b/index.pt_BR.html @@ -1,5 +1,5 @@ - + From fb06520bf0b53f41a07f61dac0a77a9a332833e3 Mon Sep 17 00:00:00 2001 From: Bo-Yi Wu Date: Fri, 26 Jun 2015 10:09:52 +0800 Subject: [PATCH 079/106] update x-ua-compatible attribute https://github.com/h5bp/html5-boilerplate/blob/master/src/index.html#L5 --- index.zh_TW.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.zh_TW.html b/index.zh_TW.html index bb12b16..3fba5f3 100644 --- a/index.zh_TW.html +++ b/index.zh_TW.html @@ -1,8 +1,8 @@ - - + + - + git-flow 備忘清單 From 6628d42fac50bd1d24b4b3903dbd1e2c3b8564c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Corr=C3=AAa=20Gomes?= Date: Fri, 26 Jun 2015 18:49:38 -0300 Subject: [PATCH 080/106] Best pratices of code, js in bottom. --- index.pt_BR.html | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/index.pt_BR.html b/index.pt_BR.html index bd2b408..926fa11 100644 --- a/index.pt_BR.html +++ b/index.pt_BR.html @@ -7,24 +7,7 @@ - - - - @@ -370,8 +353,22 @@
    + + + + + + + +
    + +

    Шпаргалка по git-flow

    + +

    + автор Daniel Kummer + + +

    +

    ефективне розгалуження з допомогою git-flow від Vincent Driessen

    +

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

    +
    + +
    + + +
    +

    Вступ

    + +

    + git-flow — це набір розширень git, який надає доступ до високорівневих операцій над репозиторієм для підтримки моделі розгалуження Vincent + Driessen. + дізнатись більше +

    +

    ★ ★ ★

    + +

    Ця шпаргалка описує основні способи використання операцій git-flow.

    + +

    ★ ★ ★

    +
    + +
    +

    Загальні зауваження

    +
      +
    • Git flow надає чудовий додаток для командного рядкя, який має довідку і покращений вивід. Уважно читайте його, щоб знати, що відбувається...
      • +
    • Клієнт для OSX/Windows Sourcetree — чудовий GUI для Git — також підтримує git-flow +
      • +
    • Git-flow заснований на злитті. Для злиття гілок фіч не використовується rebase.
      • +
    +

    ★ ★ ★

    +
    + + +
    +

    Встановлення

    +
      +
    • В першу чергу вам потрібна робоча установка git
      • +
    • Git flow працює на OSX, Linux і 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 +
    +

    Вам знадобиться wget і util-linux для установки git-flow.

    +
    +
    +

    + Докладні інструкції для встановлення git flow дивіться на git flow + wiki. +

    + install git-flow +
    +
    + +
    +

    Перші кроки

    +

    Git flow порібно ініціалізувати, щоб налаштувати його для роботи з вашим репозиторієм.

    +

    ★ ★ ★

    +
    +

    Ініціалізація

    + +

    Щоб почати використовувати git-flow проініціалізуйте його в середині існуючого репозиторія:

    +
    + git flow init +
    +

    + Вам знадобиться відповісти на декілька запитань про те, яким чином іменувати ваші гілки.
    + Рекомендується залишати значення по-замовчуванню. +

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

    Фічі

    + +
      +
    • Розробка нових фіч для подальших релізів
      • +
    • Зазвичай існує тільки в репозиторіях розробників
      • +
    +

    ★ ★ ★

    + +
    +

    Початок нової фічі

    +

    Розробка нової фічі починається з гілки "develop".

    +

    Для початку розробки нової фічі виконайте:

    +
    + git flow feature start MYFEATURE +
    +

    Ця дія створить нову гілку фічі, засновану на гілці "develop", і переключається на неї.

    + + +
    +
    +
    +
    +
    + +
    +
    +

    Завершення фічі

    + +

    + Завершення розробки фічі. + Ця дія виконується так: +

    +
      +
    • Злиття гілки MYFEATURE в "develop"
      • +
    • Видалення гілки фічі
      • +
    • Переключення назад на гілку "develop"
      • +
    + +
    + git flow feature finish MYFEATURE +
    +
    +
    +
    +
    +
    + +
    +
    +

    Публікація фічі

    + +

    + Ви розробляєте фічу в команді?
    + Опубулікуйте фічу на віддаленому сервері, щоб її могли використовувати Ваші колеги. +

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

    Отримання опублікованої фічі

    + +

    + Отримання фічі, опублікованої іншим користувачем. +

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

    Ви можете відслідковувати фічу в репозиторії origin з допомогою команди git flow feature track MYFEATURE

    +
    +
    +
    +
    +
    + + +
    +

    Створення релізу

    + +
      +
    • Підтримка підготовки нового релізу продукту
      • +
    • Дозволяє усунути дрібні помилки і підготувати різноманітні метадані для реліза
      • +
    +

    ★ ★ ★

    +
    +

    Початок релізу

    + +

    Щоб почати роботу над релізом використовуйте команду git flow release + Вона створить гілку релізу, відгалужуючись від гілки "develop". +

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

    За потреби ви может вказати [BASE]-комміт у вигляді його хешу sha-1, щоб почати реліз з нього. + Цей комміт повинен належати гілці "develop".

    +

    ★ ★ ★

    +

    Бажано одразу публікувати гілку релізу після створення, щоб інші користувачі мали змогу виконувати комміти в гілку релізу. +           Команда для публікації схожа на аналогічну команду для фіч:

    +
    + git flow release publish RELEASE +
    +

    Також можна відслідковувати віддалений реліз за допомогою команди
    git flow release track RELEASE

    +
    +
    +
    +
    +
    + +
    +
    +

    Завершення релізу

    + +

    Завершення релізу - один з найбільших кроків в git-розгалуженні. Під час цього відбувається декілька дій:

    +
      +
    • Гілка релізу зливається в гілку "master"
      • +
    • Реліз позначається тегом, який відповідає його імені
      • +
    • Гілка релізу зливається назад в гілку "develop"
      • +
    • Гілка релізу видаляється
      • +
    +
    + git flow release finish RELEASE +
    +

    Не забувайте відправляти зміни в тегах за допмогою команди git push --tags

    + +
    +
    +
    + +
    +
    + +
    +

    Виправлення

    + +
      +
    • Виправлення потрібні тоді, коли є необхідність негайно усунути небажаний стан продакшн-версії продукту
      • +
    • Може відгалужуватися від відповідного тегу на гілці "master", яким позначено випуск продакшн-версії
      • +
    +

    ★ ★ ★

    +
    +

    git flow hotfix start

    + +

    Як і в випадку з іншими командами git flow, робота над виправленнями починається так:

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

    Аргумент VERSION визанчає назву нового, виправленого релізу.

    +

    За потреби можна вказати BASENAME-комміт, від якого піде відгалуження.

    +
    +
    +
    +
    +
    + +
    +
    +

    Завершення виправлення

    + +

    Коли виправлення готове, воно зливається назад в гілки "develop" і "master". + Крім того, комміт в гілці "master" позначється тегом з версією виправлення.

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

    Команди

    + git-flow commands +
    + +
    +

    Останні зауваження

    +

    ★ ★ ★

    +
      +
    • Тут описані не всі доступні команди, а тільки найбільш важливі
      • +
    • Ви також можете продовжувати використовувати git і всі його команди, git flow — це тільки набір додаткових інструментів
      • +
    • Можливості "support"-гілок поки що тільки в beta-версії, користуватися ними не рекомендується
      • +
    +

    ★ ★ ★

    +
    +
    + + + + + + + +comments powered by Disqus + + + + diff --git a/index.zh_CN.html b/index.zh_CN.html index e56359e..c8082c2 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -49,7 +49,8 @@ Русский (Russian) - Deutsch (German) - Română (Romanian) - - Ελληνικά (Greek) + Ελληνικά (Greek) - + Українська (Ukrainian)

    diff --git a/index.zh_TW.html b/index.zh_TW.html index 3fba5f3..7ae0331 100644 --- a/index.zh_TW.html +++ b/index.zh_TW.html @@ -52,7 +52,8 @@ Deutsch (German) - Català (Catalan) - Română (Romanian) - - Ελληνικά (Greek) + Ελληνικά (Greek) - + Українська (Ukrainian)

    From ba631e6cbb9e32f31f566819881eb42845881115 Mon Sep 17 00:00:00 2001 From: no92 Date: Sun, 23 Aug 2015 20:33:25 +0200 Subject: [PATCH 082/106] several grammar and typo fixes --- index.de_DE.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/index.de_DE.html b/index.de_DE.html index 6dbe7fe..789d4a0 100644 --- a/index.de_DE.html +++ b/index.de_DE.html @@ -75,7 +75,7 @@

    git-flow ist ein Set aus Git-Erweiterungen, welches komplexe Repository-Arbeiten - nach Vincent Driessen's Branching-Modell ermöglicht. + nach Vincent Driessens Branching-Modell ermöglicht. mehr

    ★ ★ ★

    @@ -273,7 +273,7 @@

    Beginne ein Release

    - Um ein neues Releases zu beginnen, benutze den git flow release Befehl. + Um ein neues Release zu beginnen, benutze den git flow release Befehl. Mit diesem wird ein Release-Branch vom aktuellen 'develop'-Branch erstellt.

    @@ -288,7 +288,7 @@

    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: + die Möglichkeit für Commits zu geben. Mache es ähnlich wie bei einem Feature-Branch mit dem Befehl:

    git flow release publish RELEASE @@ -335,7 +335,7 @@
    • Hotfixes werden notwendig, sobald ein unerwünschter Zustand innerhalb einer Live-Produktionsversion - eintritt und resultierend daraus, sofort gehandelt werden muss. + eintritt und resultierend daraus sofort gehandelt werden muss.
    • Ein Hotfix kann aus dem entsprechenden Tag des 'master'-Branches, welcher die Produktionsversion markiert, @@ -366,9 +366,9 @@

      Fertigstellung eines Hotfixes

      - 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. + 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.

      git flow hotfix finish VERSION @@ -397,7 +397,7 @@

      Backlog

      ★ ★ ★

        -
      • Nicht alle verfügbaren Befehle sind hier abgedeckt, nur die wichtigsten.
        • +
      • Nur die wichtigsten aller verfügbaren Befehle sind hier abgedeckt.
      • Du kannst weiterhin alle Git-Befehle normal nutzen, wie Du es gewohnt bist. Git-flow ist nur eine Werkzeugsammlung.
      • Das 'support' Feature ist noch Beta und die Nutzung nicht empfohlen.
      • Wenn Du Übersetzungen beisteuern möchtest, würde ich mich freuen diese zu integrieren.
        • From a5fcedf01aed68496d52c7295d86d9f65b72aacb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Nikolaou?= Date: Thu, 8 Oct 2015 01:15:14 +0300 Subject: [PATCH 083/106] Improve translation and fix typos --- index.el_GR.html | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/index.el_GR.html b/index.el_GR.html index 52c09bd..89b4b7c 100644 --- a/index.el_GR.html +++ b/index.el_GR.html @@ -29,7 +29,7 @@ - +

        git-flow Φύλλο αναφοράς

        @@ -78,10 +78,10 @@

        Σχετικά

        - git-flow είναι ένα σύνολο από επεκτάσεις για το git που παρέχουν υψηλού επιπέδου λειτουργίες σε εν + Το git-flow είναι ένα σύνολο από επεκτάσεις για το git που παρέχουν υψηλού επιπέδου λειτουργίες σε εν- αποθετήρια για το μοντέλο διακλαδώσεων του Vincent - Driessen's. - λεπτομέρειες + Driessen. + περισσότερα

        ★ ★ ★

        @@ -97,9 +97,9 @@ δείτε τι συμβαίνει...
      • Το τερματικό Sourcetree για OSX/Windows είναι ένα εξαιρετικό - γραφικό περιβάλλων εργασίας για git και παρέχει υποστήριξη για το git flow + γραφικό περιβάλλων εργασίας για git και παρέχει υποστήριξη για το git-flow
        • -
      • Git-flow είναι μια λύση βασισμένη στο πάντρεμα (merge). Δεν αναπροσαρμόζει διακλαδώσεις +
      • Το Git-flow είναι μια λύση βασισμένη στη συγχώνευση (merge). Δεν αναπροσαρμόζει διακλαδώσεις χαρακτηριστικών.
      @@ -134,7 +134,7 @@ $ wget -q -O - --no-check-certificate https://github.com/nvie/gitflow/raw/develop/contrib/gitflow-installer.sh | bash
      -

      Χρειάζεστε το wget και το util-linux για να εγκαταστήσετε το install git-flow.

      +

      Χρειάζεστε το wget και το util-linux για να εγκαταστήσετε το git-flow.

    @@ -148,7 +148,7 @@

    Αρχίζοντας

    -

    Το Git flow πρέπει να προετοιμαστεί, ώστε να προσαρμόσει τις ρυθμίσεις του έργου σας.

    +

    Το Git flow πρέπει να προετοιμαστεί, ώστε να προσαρμόσετε τις ρυθμίσεις του έργου σας.

    ★ ★ ★

    @@ -161,7 +161,7 @@

    Θα πρέπει να απαντήσετε μερικές ερωτήσεις σχετικά με τους κανόνες ονοματοδοσίας για τις διακλαδώσεις.
    - Συνιστάτε η χρήση των τιμών που προτείνονται. + Συνιστάται η χρήση των τιμών που προτείνονται.

    @@ -178,7 +178,7 @@

    Χαρακτηριστικά

      -
    • Δημιουργήστε νέα χαρακτηριστικά για επερχόμενες εκδώσεις
      • +
    • Δημιουργήστε νέα χαρακτηριστικά για επερχόμενες εκδόσεις
    • Τυπικά υπάρχει μόνο στα εν-αποθετήρια των προγραμματιστών

    ★ ★ ★

    @@ -218,7 +218,7 @@ Αυτή η ενέργεια κάνει τα ακόλουθα

      -
    • Παντρεύει το MYFEATURE στο'develop'
      • +
    • Συγχωνεύει το MYFEATURE στο 'develop'
    • Αφαιρεί την διακλάδωση που δημιουργήθηκε για το νέο χαρακτηριστικό
    • Μεταπηδά ξανά στην διακλάδωση 'develop'
    @@ -237,7 +237,7 @@

    Δημοσιεύστε ένα χαρακτηριστικό

    - Παράγετε ένα χαρακτηριστικό της εφαρμογής σας σε συνεργασία με άλλους προγραμματιστές;
    + Αναπτύσσετε ένα χαρακτηριστικό της εφαρμογής σας σε συνεργασία με άλλους προγραμματιστές;
    Δημοσιεύστε το χαρακτηριστικό σας στον απομακρυσμένο server, ώστε να μπορούν οι άλλοι προγραμματιστές να το χρησιμοποιήσουν.

    @@ -292,7 +292,7 @@

    ★ ★ ★

    -

    Είναι σοφό να δημοσιεύσετε την διακλάδωση έκδοσης, μετά την δημιουργία της, ώστε να επιτρέψετε commits έκδοσης από άλλους προγραμματιστές. +

    Είναι καλό να δημοσιεύσετε την διακλάδωση έκδοσης, μετά την δημιουργία της, ώστε να επιτρέψετε commits έκδοσης από άλλους προγραμματιστές. Μπορείτε να το κάνετε αυτό, με τον ίδιο τρόπο που δημοσιεύεται τα νέα χαρακτηριστικά, με την εντολή:

    git flow release publish RELEASE @@ -310,9 +310,9 @@

    Η ολοκλήρωση μιας νέας έκδοσης είναι ένα από τα μεγάλα βήματα στις διακλαδώσεις του git γιατί γίνονται πολλές ενέργειες μαζί:

      -
    • Παντρεύει την διακλάδωση της έκδοσης με την διακλάδωση 'master'
      • +
    • Συγχωνεύει την διακλάδωση της έκδοσης με την διακλάδωση 'master'
    • Βάζει την ετικέτα στην έκδοση με το όνομα της
      • -
    • Παντρεύει την έκδοση με την διακλάδωση 'develop'
      • +
    • Συγχωνεύει την έκδοση με την διακλάδωση 'develop'
    • Διαγράψει την διακλάδωση της έκδοσης
    @@ -359,7 +359,7 @@

    Ολοκληρώνοντας μία άμεση επιδιόρθωση

    - Με την ολοκλήρωση μιας άμεσης επιδιόρθωσης, η διακλάδωση παντρεύεται με την διακλάδωση develop και master. + Με την ολοκλήρωση μιας άμεσης επιδιόρθωσης, η διακλάδωση συγχωνεύεται με την διακλάδωση develop και master. Επιπλέον η κεντρική διακλάδωση (master) αποκτά την ετικέτα του ονόματος της άμεσης επιδιόρθωσης.

    @@ -390,8 +390,8 @@

    ★ ★ ★

      -
    • Εδώ δεν καλύπτονται όλες οι διαθέσιμες εντολές, αλλά μόνο οι ποιο σημαντικές
      • -
    • Μπορείτε να συνεχίσετε την χρήση του git και όλες τις εντολές του κανονικά όπως τις γνωρίζεται, το git flow είναι απλά μια συλλογή με εργαλεία.
      • +
    • Εδώ δεν καλύπτονται όλες οι διαθέσιμες εντολές, αλλά μόνο οι πιο σημαντικές
      • +
    • Μπορείτε να συνεχίσετε την χρήση του git και όλες τις εντολές του κανονικά όπως τις γνωρίζετε, το git flow είναι απλά μια συλλογή με εργαλεία.
    • Το χαρακτηριστικό 'support' είναι ακόμα σε κατάσταση beta, δεν σας συμβουλεύουμε να το χρησιμοποιήσετε
    • Αν σας αρέσει να παρέχετε μεταφράσεις, θα είναι χαρά μου να τις ενσωματώσω
    From 90bff2daeca8595054facf6c78c26af4883ba288 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Fran=C3=A7ois?= Date: Wed, 21 Oct 2015 11:46:11 +0200 Subject: [PATCH 084/106] Fix french typos Small mistakes --- index.fr_FR.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.fr_FR.html b/index.fr_FR.html index a07351d..75fce04 100644 --- a/index.fr_FR.html +++ b/index.fr_FR.html @@ -163,7 +163,7 @@

    Fonctionnalités/Features

      -
    • Developpe des nouvelles fonctionnalités pour la prochaine version
      • +
    • Développe des nouvelles fonctionnalités pour la prochaine version
    • Existe en général uniquement dans les dépots des développeurs

    ★ ★ ★

    @@ -201,7 +201,7 @@ Cette action effectue les opérations suivantes:

      -
    • fusionne MYFEATURE dans 'develop'
      • +
    • Fusionne MYFEATURE dans 'develop'
    • Supprime la branche de fonctionnalité
    • Passe sur la branche 'develop'
    From 029598979fbe8876645342b1ff909573a4fcc40a Mon Sep 17 00:00:00 2001 From: Hai Do Minh Date: Sun, 1 Nov 2015 13:10:37 +0900 Subject: [PATCH 085/106] add Vietnamese file --- 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 | 2 +- index.ja_JP.html | 3 ++- index.ko_KR.html | 3 ++- index.nl_NL.html | 3 ++- 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.zh_CN.html | 3 ++- index.zh_TW.html | 3 ++- 17 files changed, 33 insertions(+), 17 deletions(-) diff --git a/index.ca_CA.html b/index.ca_CA.html index 0ac7425..46fca4d 100644 --- a/index.ca_CA.html +++ b/index.ca_CA.html @@ -64,7 +64,8 @@ Català (Catalan) - Română (Romanian) - Ελληνικά (Greek) - - Українська (Ukrainian) + Українська (Ukrainian) - + Tiếng Việt (Vietnamese)

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

    diff --git a/index.el_GR.html b/index.el_GR.html index 89b4b7c..890cd3b 100644 --- a/index.el_GR.html +++ b/index.el_GR.html @@ -67,7 +67,8 @@ Català (Catalan) - Română (Romanian) - Ελληνικά (Greek) - - Українська (Ukrainian) + Українська (Ukrainian) - + Tiếng Việt (Vietnamese)

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

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

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

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

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

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

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

    diff --git a/index.pt_BR.html b/index.pt_BR.html index 0c42c00..ab93c35 100644 --- a/index.pt_BR.html +++ b/index.pt_BR.html @@ -46,7 +46,8 @@ Català (Catalan) - Română (Romanian) - Ελληνικά (Greek) - - Українська (Ukrainian) + Українська (Ukrainian) - + Tiếng Việt (Vietnamese)

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

    diff --git a/index.ru_RU.html b/index.ru_RU.html index 9444eff..3868fbc 100644 --- a/index.ru_RU.html +++ b/index.ru_RU.html @@ -71,7 +71,8 @@ Català (Catalan) - Română (Romanian) - Ελληνικά (Greek) - - Українська (Ukrainian) + Українська (Ukrainian) - + Tiếng Việt (Vietnamese)

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

    diff --git a/index.uk_UK.html b/index.uk_UK.html index 10f017d..a8adcaf 100644 --- a/index.uk_UK.html +++ b/index.uk_UK.html @@ -71,7 +71,8 @@ Català (Catalan) - Română (Romanian) - Ελληνικά (Greek) - - Українська (Ukrainian) + Українська (Ukrainian) - + Tiếng Việt (Vietnamese)

    diff --git a/index.zh_CN.html b/index.zh_CN.html index c8082c2..73691e7 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -50,7 +50,8 @@ Deutsch (German) - Română (Romanian) - Ελληνικά (Greek) - - Українська (Ukrainian) + Українська (Ukrainian) - + Tiếng Việt (Vietnamese)

    diff --git a/index.zh_TW.html b/index.zh_TW.html index 7ae0331..8152c40 100644 --- a/index.zh_TW.html +++ b/index.zh_TW.html @@ -53,7 +53,8 @@ Català (Catalan) - Română (Romanian) - Ελληνικά (Greek) - - Українська (Ukrainian) + Українська (Ukrainian) - + Tiếng Việt (Vietnamese)

    From 8ccd4fe551b8663dd39e84d73835e90aad455e7b Mon Sep 17 00:00:00 2001 From: Hai Do Minh Date: Sun, 1 Nov 2015 13:11:09 +0900 Subject: [PATCH 086/106] Translated upto Release --- index.vi_VN.html | 398 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 398 insertions(+) create mode 100644 index.vi_VN.html diff --git a/index.vi_VN.html b/index.vi_VN.html new file mode 100644 index 0000000..7b80623 --- /dev/null +++ b/index.vi_VN.html @@ -0,0 +1,398 @@ + + + + + + Tóm tắt Git-Flow + + + + + + + + + + + +
    + +

    Tóm tắt về Git-Flow

    + +

    + 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) +

    +
    + +
    + + +
    +

    git-flow là gì?

    + +

    + git-flow là một tập các thao tác mở rộng của git nhằm cung cấp các thao tác repository (kho mã nguồn) ở mức cao dựa trên mô hình phân nhánh của Vincent Driessen. + xem chi tết ở đây +

    +

    ★ ★ ★

    + +

    Bản tóm tắt nãy sẽ cho bạn biết cách sử dụng cơ bản và hiệu quả của git-flow.

    + +

    ★ ★ ★

    +
    + +
    +

    Một vài lời khuyên

    +
      +
    • Git flow cung cấp giao diện trợ giúp và đầu ra rất tuyệt vời. Hãy đọc chúng cẩn thận để xem điều kì diệu gì sẽ xảy ra ;)
      • +
    • Git Client - Sourcetree là một Git Client có giao diện GUI rất tiện lợi và cũng hỗ trợ luôn git-flow trên giao diện.
      • +
    • Git-flow là một giải pháp dựa trên merge. Nó không rebase các nhánh tính năng.
      • +
    +

    ★ ★ ★

    +
    + + +
    +

    Cài đặt

    +
      +
    • Bạn cần cài đặt git trước khi có thể cài git-flow.
      • +
    • Git flow có thể hoạt động trên OSX, Linux và 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 +
    +

    Bạn cần wget và util-linux để cài đặt git-flow.

    +
    +
    +

    + Xem chi tiết về cách cài đặt git flow ở trang sau: git flow + wiki. +

    + install git-flow +
    +
    + +
    +

    Bắt đầu nào

    +

    Git flow cần phải khởi tạo để có thể tùy chỉnh các cài đặt của dự án của bạn.

    +

    ★ ★ ★

    +
    +

    Khởi tạo

    + +

    Sau khi di chuyển tới thư mục dự án, chạy lệnh sau để khởi tạo git-flow.

    +
    + git flow init +
    +

    + Bạn sẽ cần trả lời một số câu hỏi cho việc thiết lập git-flow sau câu lệnh khởi tạo. + Chúng tôi khuyên bạn nên sử dụng các giá trị [mặc định]. +

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

    Các tính năng

    + +
      +
    • Phát triển các tính năng cho việc release sắp tới.
      • +
    • Về cơ bản chỉ tổ chức ở repos của các lập trình viên.
      • +
    +

    ★ ★ ★

    + +
    +

    Bắt đầu một tính năng

    +

    Phát triển tính năng mới bắt đầu từ nhánh phát triển'develop'. Ví dụ với tính năng MYFEATURE:

    +
    + git flow feature start MYFEATURE +
    +

    Lệnh này sẽ tạo ra một nhánh mới dựa trên nhánh 'develop' và chuyển sang nhánh mới này.

    + + +
    +
    +
    +
    +
    + +
    +
    +

    Kết thúc một tính năng

    + +

    + Sau khi phát triển xong một tính năng, lệnh kết thúc tính năng sẽ thực hiện các thao tác: +

    +
      +
    • Merge nhánh tính năng - MYFEATURE vào nhánh 'develop'
      • +
    • Xoá nhánh tính năng
      • +
    • Chuyển sang nhánh 'develop'
      • +
    + +
    + git flow feature finish MYFEATURE +
    +
    +
    +
    +
    +
    + +
    +
    +

    Công bố tính năng

    + +

    + Khi bạn làm việc với những người khác trên cùng một tính năng, + bạn sẽ cần công bố phần mã nguồn của bạn cho tính năng đó lên remote + để những người khác có thể cập nhập được. +

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

    Lấy về tính năng

    + +

    + Pull mã nguồn của tính năng được cập nhập bởi những thành viên khác. +

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

    Tạo một bản release

    + +
      +
    • リリースのための準備を行います。
      • +
    • 軽微なバグフィックスを行ったり、リリースのため作業を行います。
      • +
    +

    ★ ★ ★

    +
    +

    リリース準備開始

    + +

    リリース作業を開始するには、git flowのreleaseコマンドを使います

    + 'develop'ブランチから'release'ブランチを作成します +

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

    [BASE]はオプションで 'develop'ブランチの特定のCommitのハッシュ値を指定します。指定がない場合はHEADが使われます。

    +

    ★ ★ ★

    +

    'release'ブランチ作成後に修正をプッシュするには、'feature'の時と似たコマンドを使用します:

    +
    + git flow release publish RELEASE +
    +

    ('release'リポジトリの修正のトラッキングをすることもできます
    git flow release track RELEASE )

    +
    +
    +
    +
    +
    + +
    +
    +

    リリース準備完了

    + +

    リリース準備の終了作業は、gitのリポジトリが大きく変化します:

    +
      +
    • 'release'ブランチを'master'にマージします。
      • +
    • 'master'ブランチにリリース用のタグをつけます。
      • +
    • 'develop'ブランチに'release'ブランチの内容がマージされます。
      • +
    • 'release'ブランチが削除されます。
      • +
    +
    + git flow release finish RELEASE +
    +
    +
    +
    + +
    +
    + +
    +

    Sửa lỗi nóng

    + +
      +
    • すぐに適用しなければいけないような、緊急の場合に使用します。
      • +
    • 'master'ブランチのタグから、緊急対応用のブランチを作成します。
      • +
    +

    ★ ★ ★

    +
    +

    緊急対応の開始

    + +

    他のgit flowコマンドと似た形で、hotfixを開始します

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

    バージョンの引数は、ホットフィックスリリース名を指定します。 オプションとして開始するベースを指定出来ます。

    +

    +
    +
    +
    +
    +
    + +
    +
    +

    緊急対応の終了

    + +

    緊急対応の終了作業は、'develop'と'master'のブランチをマージします。加えて、'master'ブランチは緊急対応のタグが付けられます。

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

    Các lệnh

    + git-flow commands +
    + +
    +

    Lưu ý

    +

    ★ ★ ★

    +
      +
    • コマンドのすべてをカバーしているわけではなく、重要なものだけカバーしています。
      • +
    • もちろん、gitのコマンドは通常通りすべて使用することができます。git flowは単にgitのコマンドの集合です。
      • +
    • 'support'ブランチの機能はまだベータ版です。それについては言及できません。
      • +
    • もし翻訳して頂けるなら、統合してもらえると幸いです。
      • +
    +

    ★ ★ ★

    +
    +
    + + + + + + + +comments powered by Disqus + + + + From 7f30269f9456e70d95db6d2c7fbb2fa541a4e575 Mon Sep 17 00:00:00 2001 From: Hai Do Minh Date: Sun, 1 Nov 2015 13:47:37 +0900 Subject: [PATCH 087/106] Finish release --- index.vi_VN.html | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/index.vi_VN.html b/index.vi_VN.html index 7b80623..734a511 100644 --- a/index.vi_VN.html +++ b/index.vi_VN.html @@ -242,7 +242,7 @@

    - git flow feature pull MYFEATURE + git flow feature pull REMOTE_NAME MYFEATURE
    @@ -255,26 +255,26 @@

    Tạo một bản release

      -
    • リリースのための準備を行います。
      • -
    • 軽微なバグフィックスを行ったり、リリースのため作業を行います。
      • +
    • Hỗ trợ chuẩn bị cho bản release.
      • +
    • Cho phép sửa các lỗi nhỏ và chuẩn bị meta-data cho release.

    ★ ★ ★

    -

    リリース準備開始

    +

    Bắt đầu release

    -

    リリース作業を開始するには、git flowのreleaseコマンドを使います

    - 'develop'ブランチから'release'ブランチを作成します +

    Để bắt đầu release, sử dụng lệnh release của git flow.

    + Lệnh này sẽ tạo ra nhánh 'release' từ nhánh 'develop'.

    git flow release start RELEASE [BASE]
    -

    [BASE]はオプションで 'develop'ブランチの特定のCommitのハッシュ値を指定します。指定がない場合はHEADが使われます。

    +

    Tùy chọn [BASE] cho phép commit được một giá trị hash sha-1. Trường hợp không chỉ định tùy chọn này thì HEAD sẽ được sử dụng.

    ★ ★ ★

    -

    'release'ブランチ作成後に修正をプッシュするには、'feature'の時と似たコマンドを使用します:

    +

    Để công bố phần code 'release' của mình cho các thành viên khác, ta có thể làm tương tự như với công bố tính năng bằng lệnh sau:

    git flow release publish RELEASE
    -

    ('release'リポジトリの修正のトラッキングをすることもできます
    git flow release track RELEASE )

    +

    (Bạn có thể theo dấu remote 'release' bằng lệnh
    git flow release track RELEASE )

    @@ -283,14 +283,14 @@
    -

    リリース準備完了

    +

    Kết thúc release

    -

    リリース準備の終了作業は、gitのリポジトリが大きく変化します:

    +

    Kết thúc release là một bước lớn trong chiến lược phân nhánh git. Nó thực hiện các việc sau:

      -
    • 'release'ブランチを'master'にマージします。
      • -
    • 'master'ブランチにリリース用のタグをつけます。
      • -
    • 'develop'ブランチに'release'ブランチの内容がマージされます。
      • -
    • 'release'ブランチが削除されます。
      • +
    • Merge nhánh 'release' vào nhánh 'master'
      • +
    • Gắn tag ở nhánh 'master' dành cho bản release
      • +
    • Merge lại nhánh 'release' vào nhánh 'develop'
      • +
    • Xóa bỏ nhánh 'release'
    git flow release finish RELEASE From 7ec80f6e3de112fa4686bbd95ac27e70510e49b9 Mon Sep 17 00:00:00 2001 From: Hai Do Minh Date: Sun, 1 Nov 2015 14:02:20 +0900 Subject: [PATCH 088/106] hotfix --- index.vi_VN.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/index.vi_VN.html b/index.vi_VN.html index 734a511..12f2c11 100644 --- a/index.vi_VN.html +++ b/index.vi_VN.html @@ -303,21 +303,21 @@
    -

    Sửa lỗi nóng

    +

    Sửa đổi nóng - hotfix

      -
    • すぐに適用しなければいけないような、緊急の場合に使用します。
      • -
    • 'master'ブランチのタグから、緊急対応用のブランチを作成します。
      • +
    • Sử dụng cho các trường hợp khẩn cấp cần phải sửa đổi ngay trên bản sản phẩm (nhánh master).
      • +
    • Có thể tạo nhánh giải quyết khẩn cấp từ tag của nhánh 'master'.

    ★ ★ ★

    -

    緊急対応の開始

    +

    Bắt đầu hotfix

    -

    他のgit flowコマンドと似た形で、hotfixを開始します

    +

    Giống như các lệnh khác của git flow, hotfix bắt đầu với:

    git flow hotfix start VERSION [BASENAME]
    -

    バージョンの引数は、ホットフィックスリリース名を指定します。 オプションとして開始するベースを指定出来ます。

    +

    Tham số VERSION ở đây chỉ định tên của phiên bản release hotfix này. Còn tham số tùy chọn basename sẽ chỉ định tên nhánh cơ bản thay cho hotfix thay vì nhánh 'master'

    @@ -327,9 +327,9 @@
    -

    緊急対応の終了

    +

    Kết thúc hotfix

    -

    緊急対応の終了作業は、'develop'と'master'のブランチをマージします。加えて、'master'ブランチは緊急対応のタグが付けられます。

    +

    Kết thúc hotfix sẽ merge lại nội dung thay đổi vào nhánh 'develop' và 'master'. Ở nhánh 'master' sẽ được gắn tag là phiên bản của hotfix.

    git flow hotfix finish VERSION
    From 35167738f0607dbf4834d058ebcd24a8fe4144a8 Mon Sep 17 00:00:00 2001 From: Hai Do Minh Date: Sun, 1 Nov 2015 14:15:36 +0900 Subject: [PATCH 089/106] done --- index.vi_VN.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.vi_VN.html b/index.vi_VN.html index 12f2c11..d08e411 100644 --- a/index.vi_VN.html +++ b/index.vi_VN.html @@ -357,10 +357,10 @@

    Lưu ý

    ★ ★ ★

      -
    • コマンドのすべてをカバーしているわけではなく、重要なものだけカバーしています。
      • -
    • もちろん、gitのコマンドは通常通りすべて使用することができます。git flowは単にgitのコマンドの集合です。
      • -
    • 'support'ブランチの機能はまだベータ版です。それについては言及できません。
      • -
    • もし翻訳して頂けるなら、統合してもらえると幸いです。
      • +
    • Ở đây không giới thiệu được tất cả các lệnh mà chỉ đưa ra một số lệnh quan trọng nhất của git-flow.
      • +
    • Tất nhiên là bạn vẫn có thể sử dụng toàn bộ các lệnh thông thường của git. git-flow chỉ đơn giản là một tập hợp các lệnh mở rộng cho git.
      • +
    • Chức năng nhánh 'support' vẫn đang là bản beta nên không được đề cập ở đây.
      • +
    • Tôi rất sẵn sòng tích hợp bất kì bản dịch nào nếu bạn sẵn lòng :)

    ★ ★ ★

    From f38f0ada7213d961be1bdba5471c30b873836c53 Mon Sep 17 00:00:00 2001 From: Hai Do Minh Date: Sun, 1 Nov 2015 14:34:26 +0900 Subject: [PATCH 090/106] fix active Vietnamese link --- index.el_GR.html | 2 +- index.es_ES.html | 2 +- index.fr_FR.html | 2 +- index.it_IT.html | 2 +- index.ko_KR.html | 2 +- index.nl_NL.html | 2 +- index.pt_BR.html | 2 +- index.ro_RO.html | 2 +- index.ru_RU.html | 2 +- index.tr_TR.html | 2 +- index.uk_UK.html | 2 +- index.zh_CN.html | 2 +- index.zh_TW.html | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/index.el_GR.html b/index.el_GR.html index 890cd3b..b2eea47 100644 --- a/index.el_GR.html +++ b/index.el_GR.html @@ -68,7 +68,7 @@ Română (Romanian) - Ελληνικά (Greek) - Українська (Ukrainian) - - Tiếng Việt (Vietnamese) + Tiếng Việt (Vietnamese)

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

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

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

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

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

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

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

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

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

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

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

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

    From 1582491b6a4cf187cc16ee122a2e1795ca427025 Mon Sep 17 00:00:00 2001 From: Guillermo Calvo Date: Thu, 21 Jan 2016 11:44:05 +0100 Subject: [PATCH 091/106] Fix typo --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index b2202c4..41ebfda 100644 --- a/index.html +++ b/index.html @@ -129,7 +129,7 @@

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

    install git-flow From f6a528f3e6f07e69d34f3bacca85d85ec9cd3620 Mon Sep 17 00:00:00 2001 From: pwl Date: Wed, 10 Feb 2016 22:10:36 +0100 Subject: [PATCH 092/106] 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 093/106] 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 094/106] 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.

    +
    +
    +
    +
    +
    + +
    +
    +

    Dovršavnje funkcionalnosti

    + +

    + Dovršite razvoj nove funkcionalnosti. + Ova akcija izvršava slijedeće +

    +
      +
    • Mergea MYFEATURE u 'develop'
      • +
    • Uklanja branch funkcionalnosti
      • +
    • Prebacuje natrag u 'develop' branch
      • +
    + +
    + git flow feature finish MYFEATURE +
    +
    +
    +
    +
    +
    + +
    +
    +

    Publiciranje funkcionalnosti

    + +

    + Razvijate li funkcionalnost zajedno s nekim?
    + Publicirajte funkcionalnost na udaljeni server tako da ju mogu koristiti drugi korisnici. +

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

    Preuzimanje publicirane funkcionalnosti

    + +

    + Preuzmite funkcionalnost koju je netko razvio. +

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

    Možete pratiti razvoj funkcionalnost sa: git flow feature track MYFEATURE

    +
    +
    +
    +
    +
    + + +
    +

    Release

    + +
      +
    • Podrška za publiciranje release-a na produkciju
      • +
    • Omogućavanje ispravke manjig bugova i pripremu metapodataka za release
      • +
    +

    ★ ★ ★

    +
    +

    Započnite release

    + +

    Da započnete release, koristite git flow release komandu. Kreira release branch kreiran iz 'develop' branch-a.

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

    Opcionalno, možete dati [BASE] sha-1 hash commit-a iz kojeg da se započne release. Commit mora biti na 'develop' branchu.

    +

    ★ ★ ★

    +

    Bilo bi pametno publicirati release branch nakon kreiranja da se omoguće release commit-i + od ostalih developera. Slično publiciranju funkcionlanosti:

    +
    + git flow release publish RELEASE +
    +

    (Možete pratiti udaljeni release sa
    git flow release track RELEASE komandom)

    +
    +
    +
    +
    +
    + +
    +
    +

    Dovršavanje release-a

    + +

    Dovršiti release je veliki korak u git branchanju. Izvršava nekoliko akcija:

    +
      +
    • Merge-a release branch natrag u 'master'
      • +
    • Tagira release sa njegovim nazivom
      • +
    • Merge-a release natrag u 'develop'
      • +
    • Uklanja release branch
      • +
    +
    + git flow release finish RELEASE +
    +

    Ne zaboravite da pošaljete tagove sa git push --tags

    + +
    +
    +
    + +
    +
    + +
    +

    Brze prepravke

    + +
      +
    • Kada je potrebno brzinski ispraviti greške na produkciji, koristi se hotfix mogućnost. +
      • +
    • Može se napraviti branch iz odgovarajućeg taga na master branchu koji označava produkcijsku verziju.
      • +
    +

    ★ ★ ★

    +
    +

    git flow hotfix start

    + +

    Kao i druge git flow komande, hotfix se započinje sa

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

    Argumet 'version' označava naziv hotfix release-a. Dodatno, možete specificirati 'basename' iz kojeg se započinje hotfix.

    +
    +
    +
    +
    +
    + +
    +
    +

    Dovršavanje hotfixa

    + +

    Dovršavanje, hotfix ibiva merge-an natrag u 'develop' i 'master'. Dodatno, merge u 'master' mbiva tagiran sa verzijom hotfixa.

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

    Komande

    + git-flow commands +
    + +
    +

    Backlog

    +

    ★ ★ ★

    +
      +
    • Nisu sve moguće komande, samo one načešće korištene
      • +
    • Možete dalje normalno koristiti git i sve njegove komande, git flow je samo kolekcija alata +
      • +
    • Npr. 'support' mogućnost je još beta, njena se uporaba ne preporuča
      • +
    • Pošaljite svoje prijevode, rado ću ih integrirati
      • +
    +

    ★ ★ ★

    +
    +
    + + + + + + + +Komentari putem Disqus + + + + From 88aff654676fa69039ef73e97dca6fd5b200af09 Mon Sep 17 00:00:00 2001 From: Eric Bouchut Date: Thu, 31 Mar 2016 17:45:40 +0200 Subject: [PATCH 099/106] Fix a typo in: git flow feature finish --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 4ede3c3..6999513 100644 --- a/index.html +++ b/index.html @@ -206,7 +206,7 @@ This action performs the following

      -
    • Merged MYFEATURE into 'develop'
      • +
    • Merges MYFEATURE into 'develop'
    • Removes the feature branch
    • Switches back to 'develop' branch
    From 41b71b8961944cb06c2dec404139b7d959181aac Mon Sep 17 00:00:00 2001 From: Christian Ulbrich Date: Wed, 20 Apr 2016 11:08:21 +0200 Subject: [PATCH 100/106] replace git-flow with git-flow-avh and adjust instructions accordingly link to avh wiki instead of abandoned nvie wiki deep link to Windows instructions --- index.ca_CA.html | 8 ++++---- index.de_DE.html | 8 ++++---- index.el_GR.html | 8 ++++---- index.es_ES.html | 8 ++++---- index.fr_FR.html | 8 ++++---- index.hr_HR.html | 8 ++++---- index.html | 8 ++++---- index.it_IT.html | 8 ++++---- index.ja_JP.html | 8 ++++---- index.ko_KR.html | 8 ++++---- index.nl_NL.html | 8 ++++---- index.pl_PL.html | 8 ++++---- index.pt_BR.html | 8 ++++---- index.ro_RO.html | 8 ++++---- index.ru_RU.html | 8 ++++---- index.tr_TR.html | 8 ++++---- index.uk_UK.html | 8 ++++---- index.vi_VN.html | 8 ++++---- index.zh_CN.html | 8 ++++---- index.zh_TW.html | 8 ++++---- 20 files changed, 80 insertions(+), 80 deletions(-) diff --git a/index.ca_CA.html b/index.ca_CA.html index c52ea15..9bf19bd 100644 --- a/index.ca_CA.html +++ b/index.ca_CA.html @@ -110,11 +110,11 @@

    OSX

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

    Linux

    @@ -123,13 +123,13 @@

    Windows (Cygwin)

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

    Necessites wget i util-linux per instal·lar git-flow.

    - Per instruccions detallades per instal·lar git flow, visita la wiki de git flow. + Per instruccions detallades per instal·lar git flow, visita la wiki de git flow.

    install git-flow
    diff --git a/index.de_DE.html b/index.de_DE.html index b35ba32..6f01a65 100644 --- a/index.de_DE.html +++ b/index.de_DE.html @@ -109,11 +109,11 @@

    OSX

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

    Linux

    @@ -122,13 +122,13 @@

    Windows (Cygwin)

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

    Du benötigst wget und util-linux um git-flow zu installieren.

    - Für eine detaillierte git-flow Installationsanleitung, besuche bitte das git flow + Für eine detaillierte git-flow Installationsanleitung, besuche bitte das git flow wiki.

    install git-flow diff --git a/index.el_GR.html b/index.el_GR.html index f9a28cc..9cce83c 100644 --- a/index.el_GR.html +++ b/index.el_GR.html @@ -121,11 +121,11 @@

    OSX

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

    Linux

    @@ -134,14 +134,14 @@

    Windows (Cygwin)

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

    Χρειάζεστε το wget και το util-linux για να εγκαταστήσετε το git-flow.

    Για αναλυτικές οδηγίες εγκατάστασης του git flow παρακαλώ επισκεφτείτε το - git flow wiki. + git flow wiki.

    install git-flow
    diff --git a/index.es_ES.html b/index.es_ES.html index f25e73b..2f3ebd5 100644 --- a/index.es_ES.html +++ b/index.es_ES.html @@ -110,11 +110,11 @@

    OSX

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

    Linux

    @@ -123,13 +123,13 @@

    Windows (Cygwin)

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

    Necesitarás wget y util-linux para instalar git-flow.

    - Para instrucciones de instalación detalladas, por favor, visite la wiki de git flow + Para instrucciones de instalación detalladas, por favor, visite la wiki de git flow

    install git-flow
    diff --git a/index.fr_FR.html b/index.fr_FR.html index c18ec25..ae2f4ab 100644 --- a/index.fr_FR.html +++ b/index.fr_FR.html @@ -109,11 +109,11 @@

    OSX

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

    Linux

    @@ -122,14 +122,14 @@

    Windows (Cygwin)

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

    Vous aurez besoin de wget et de util-linux pour installer git-flow.

    Pour des instructions détaillées concernant l'installation de git-flow, consultez le - wiki git-flow. + wiki git-flow.

    install git-flow
    diff --git a/index.hr_HR.html b/index.hr_HR.html index 741521d..5d87a5f 100644 --- a/index.hr_HR.html +++ b/index.hr_HR.html @@ -112,11 +112,11 @@

    OSX

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

    Linux

    @@ -125,13 +125,13 @@

    Windows (Cygwin)

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

    Trebate wget i util-linux za instaliranje git-flow.

    - Za detaljne instalacijske upute posjetite git flow + Za detaljne instalacijske upute posjetite git flow wiki.

    install git-flow diff --git a/index.html b/index.html index 4ede3c3..06edaf0 100644 --- a/index.html +++ b/index.html @@ -111,11 +111,11 @@

    OSX

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

    Linux

    @@ -124,13 +124,13 @@

    Windows (Cygwin)

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

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

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

    install git-flow diff --git a/index.it_IT.html b/index.it_IT.html index eb59c2a..02013c4 100644 --- a/index.it_IT.html +++ b/index.it_IT.html @@ -109,11 +109,11 @@

    OSX

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

    Linux

    @@ -122,13 +122,13 @@

    Windows (Cygwin)

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

    Sono necessari wget e util-linux per installare git-flow.

    - Per le istruzioni dettagliate riguardo l'installazione di git-flow visitate il wiki di git flow. + Per le istruzioni dettagliate riguardo l'installazione di git-flow visitate il wiki di git flow.

    install git-flow
    diff --git a/index.ja_JP.html b/index.ja_JP.html index a145bc3..077e905 100644 --- a/index.ja_JP.html +++ b/index.ja_JP.html @@ -108,11 +108,11 @@

    OSX

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

    Linux

    @@ -121,13 +121,13 @@

    Windows (Cygwin)

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

    git-flowのインストールには、wgetとutil-linuxが必要です。

    - 詳細なgit flowのインストール方法は以下のサイトを参考にしてください。 git flow + 詳細なgit flowのインストール方法は以下のサイトを参考にしてください。 git flow wiki.

    install git-flow diff --git a/index.ko_KR.html b/index.ko_KR.html index a5fd286..5a279f4 100644 --- a/index.ko_KR.html +++ b/index.ko_KR.html @@ -108,11 +108,11 @@

    OSX

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

    Linux

    @@ -121,13 +121,13 @@

    Windows (Cygwin)

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

    git-flow의 설치를 위해서는 wget과 util-linux가 필요합니다.

    - 상세한 git flow의 설치 방법은 git flow wiki를 참고하세요. + 상세한 git flow의 설치 방법은 git flow wiki를 참고하세요.

    install git-flow
    diff --git a/index.nl_NL.html b/index.nl_NL.html index 0917156..8a26740 100644 --- a/index.nl_NL.html +++ b/index.nl_NL.html @@ -110,11 +110,11 @@

    OSX

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

    Linux

    @@ -123,13 +123,13 @@

    Windows (Cygwin)

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

    Je hebt wget en util-linux nodig om git-flow te installeren.

    - Gedetailleerde installatie instructies voor git flow kun je vinden op degit flow + Gedetailleerde installatie instructies voor git flow kun je vinden op degit flow wiki.

    install git-flow diff --git a/index.pl_PL.html b/index.pl_PL.html index aa0b046..bcc87a3 100644 --- a/index.pl_PL.html +++ b/index.pl_PL.html @@ -115,11 +115,11 @@

    OSX

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

    Linux

    @@ -128,14 +128,14 @@

    Windows (Cygwin)

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

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

    Szczegółową instrukcję instalacji git możesz znaleźć na - git flow wiki. + git flow wiki.

    install git-flow
    diff --git a/index.pt_BR.html b/index.pt_BR.html index 6efc7e4..e265e55 100644 --- a/index.pt_BR.html +++ b/index.pt_BR.html @@ -94,11 +94,11 @@

    OSX

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

    Linux

    @@ -107,13 +107,13 @@

    Windows (Cygwin)

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

    Para instruções detalhadas sobre a instalação, visite - a wiki + a wiki do git-flow.

    install git-flow diff --git a/index.ro_RO.html b/index.ro_RO.html index 24ecfda..9a9cbee 100644 --- a/index.ro_RO.html +++ b/index.ro_RO.html @@ -109,11 +109,11 @@

    OSX

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

    Linux

    @@ -122,13 +122,13 @@

    Windows (Cygwin)

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

    Vei avea nevoie de wget și de util-linux pentru a instala git-flow.

    - Pentru instrucțiuni detaliate de instalare a git flow te rugăm să vizitezi wiki-ul git flow. + Pentru instrucțiuni detaliate de instalare a git flow te rugăm să vizitezi wiki-ul git flow.

    install git-flow
    diff --git a/index.ru_RU.html b/index.ru_RU.html index c2286b2..48dc499 100644 --- a/index.ru_RU.html +++ b/index.ru_RU.html @@ -118,11 +118,11 @@

    OSX

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

    Linux

    @@ -131,13 +131,13 @@

    Windows (Cygwin)

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

    Вам потребуется wget и util-linux для установки git-flow.

    - Подробные инструкции по установке git flow смотрите на git flow + Подробные инструкции по установке git flow смотрите на git flow wiki.

    install git-flow diff --git a/index.tr_TR.html b/index.tr_TR.html index b05f87d..06dffde 100644 --- a/index.tr_TR.html +++ b/index.tr_TR.html @@ -115,11 +115,11 @@

    OSX

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

    Linux

    @@ -128,14 +128,14 @@

    Windows (Cygwin)

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

    Git flow kurulumu için wget ve util-linux gerekmektedir.

    Git-flow kurulumu hakkında detaylı bilgi için git flow wiki'yi - ziyaret edebilirsiniz.git flow + ziyaret edebilirsiniz.git flow wiki.

    install git-flow diff --git a/index.uk_UK.html b/index.uk_UK.html index 20ed3dd..60b06ac 100644 --- a/index.uk_UK.html +++ b/index.uk_UK.html @@ -118,11 +118,11 @@

    OSX

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

    Linux

    @@ -131,13 +131,13 @@

    Windows (Cygwin)

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

    Вам знадобиться wget і util-linux для установки git-flow.

    - Докладні інструкції для встановлення git flow дивіться на git flow + Докладні інструкції для встановлення git flow дивіться на git flow wiki.

    install git-flow diff --git a/index.vi_VN.html b/index.vi_VN.html index 88cd25b..3179fdf 100644 --- a/index.vi_VN.html +++ b/index.vi_VN.html @@ -108,11 +108,11 @@

    OSX

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

    Linux

    @@ -121,13 +121,13 @@

    Windows (Cygwin)

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

    Bạn cần wget và util-linux để cài đặt git-flow.

    - Xem chi tiết về cách cài đặt git flow ở trang sau: git flow + Xem chi tiết về cách cài đặt git flow ở trang sau: git flow wiki.

    install git-flow diff --git a/index.zh_CN.html b/index.zh_CN.html index 6bdfc7f..459b0be 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -95,11 +95,11 @@

    OSX

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

    Linux

    @@ -108,13 +108,13 @@

    Windows (Cygwin)

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

    安装 git-flow, 你需要 wget 和 util-linux。

    - 更多的 git flow 安装指引，请阅读 git flow wiki. + 更多的 git flow 安装指引，请阅读 git flow wiki.

    install git-flow
    diff --git a/index.zh_TW.html b/index.zh_TW.html index bb92344..de6e2c9 100644 --- a/index.zh_TW.html +++ b/index.zh_TW.html @@ -98,11 +98,11 @@

    Mac OS X

    透過 Homebrew 安裝
    - $ brew install git-flow + $ brew install git-flow-avh
    透過 Macports 安裝
    - $ port install git-flow + $ port install git-flow-avh

    Linux

    @@ -111,13 +111,13 @@

    Windows (Cygwin)

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

    在 Windows 下安装 git-flow, 你會需要 wget 和 util-linux。

    - 更詳細的 git-flow 安裝指南，請參閱 git flow wiki. + 更詳細的 git-flow 安裝指南，請參閱 git flow wiki.

    install git-flow
    From deadac65552503603641a6030923d145ccef7875 Mon Sep 17 00:00:00 2001 From: Terence Wong Date: Thu, 5 May 2016 08:27:59 +1200 Subject: [PATCH 101/106] Update index.zh_CN.html Add back the missing link to traditional chinese page. --- index.zh_CN.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.zh_CN.html b/index.zh_CN.html index 459b0be..23ee1be 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -39,6 +39,7 @@ English - Castellano - Brazilian Portugues - + 繁體中文(Traditional Chinese) - 简体中文(Simplified Chinese) 日本語 - Türkçe - From db19a0e499ed7f9e1a2757e2c1c9c6c682c8dd1a Mon Sep 17 00:00:00 2001 From: Jose Luis Vaquero Cuevas Date: Fri, 1 Jul 2016 09:04:49 +0200 Subject: [PATCH 102/106] -Follow spanish version of Pro Git book naming convention. -Infinitive verbs in all titles to keep consistency. -'Finalizar' better than 'Terminar' in this context. -'Obtiene' better than 'Descarga' in this context. --- index.es_ES.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/index.es_ES.html b/index.es_ES.html index 2f3ebd5..648a0cd 100644 --- a/index.es_ES.html +++ b/index.es_ES.html @@ -177,7 +177,7 @@
    git flow feature start MYFEATURE
    -

    Esta acción crea una nueva rama derivada de 'develop' y luego cambia el código a esta rama.

    +

    Esta acción crea una nueva rama derivada de 'develop' y salta a esta, estableciéndola como rama de trabajo actual.

    +
+
+
+
+
+ +
+
+

Xüsusiyyəti tamamlayın

+ +

+ Xüsusiyyətin tərtibatını tamamlayın. + Bu əmr aşağıdakılarını yerinə yetirir: +

+
    +
  • MYFEATURE budağını 'develop' budağına birləşdirir
    • +
  • Xüsusiyyət budağını silir
    • +
  • 'develop' budağına qoşulur
    • +
+ +
+ git flow feature finish MYFEATURE +
+
+
+
+
+
+ +
+
+

Xüsusiyyəti yayımlayın

+ +

+ Xüsusiyyəti birlikdə tərtib edirsiniz?
+ Tərtib etdiyiniz xüsusiyyəti kənar serverə yayımlayın ki, digər istifadəçilər ondan yararlana bilsinlər. +

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

Yayımlanmış xüsusiyyətin əldə olunması

+ +

+ Digər istifadəçinin yayımladığı xüsusiyyəti əldə edin. +

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

Xüsusiyyəti origin deposunda aşağıdakı əmrlə izləyə bilərsiniz git flow feature track MYFEATURE

+
+
+
+
+
+ + +
+

Buraxılış yaradın

+ +
    +
  • Yeni buraxılışa hazırlıqda kömək edir.
    • +
  • Kiçik xətaların düzəldilməsinə və buraxılış üçün meta-məlumatların hazırlanmasına imkan verir
    • +
+

★ ★ ★

+
+

Buraxılışa başlayın

+ +

Buraxılışa başlamaq üçün git flow release əmrindən istifadə edin. O 'develop' budağı əsasında buraxılış budağını yaradır.

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

İstədiyiniz halda [BASE] - kommitin sha-1 heşini verməklə buraxılışa burdan başlaya bilərsiniz. + Bu kommit 'develop' budağında olmalıdır.

+

★ ★ ★

+

Digər tərtibatçıların da buraxılış kommitlərinə imkan yaratmaq üçün, buraxılış budağı yaradıldıqdan dərhal sonra yayımlanması yaxşı olardı. Bunu aşağıdakı əmrlə, xüsusiyyət yayımlanmasına bənzər şəkildə edin:

+
+ git flow release publish RELEASE +
+

(Kənar buraxılışları izləmək üçün
git flow release track RELEASE əmrindən istifadə edə bilərsiniz)

+
+
+
+
+
+ +
+
+

Buraxılışı tamamlayın

+ +

Buraxılışın tamamlanması git budaqlanmsında böyük addımlardan biridir. O aşağıdakıları yerinə yetirir:

+
    +
  • Buraxılış budağını 'master' budağına birləşdirir
    • +
  • Buraxılışı adına uyğun teqləyir
    • +
  • Buraxılış budağı geriyə, 'develop' budağına birləşir
    • +
  • Buraxılış budağı silinir
    • +
+
+ git flow release finish RELEASE +
+

git push --tags əmri ilə teqlərinizi göndərməyi unutmayın

+ +
+
+
+ +
+
+ +
+

Düzəlişlər

+ +
    +
  • Düzəliş ehtiyacı məhsulun işlək, hazır versiyasındakı arzuolunmaz halı dərhal aradan qaldırmaq üçün yaranır.
    • +
  • Hazır versiyaya uyğun master budağındakı teqdən budaqlana bilər.
    • +
+

★ ★ ★

+
+

git flow hotfix start

+ +

Digət git flow əmrləri kimi düzəliş

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

ilə başlayır

+

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

+

Versiya arqumenti yeni düzəliş edilmiş buraxılış adını təyin edir. İstədiyiniz halda düzəlişə başlayacağınız BASENAME-kommiti göstərə bilərsiniz.

+
+
+
+
+
+ +
+
+

Düzəlişi tamamlayın

+

Düzəliş tamamlandığı halda o 'develop' və 'master' budaqlarına birləşir. Əlavə olaraq 'master' budağına birləşmə düzəlişin versiyası ilə teqlənir.

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

Əmrlər

+ git-flow commands +
+ +
+

Qeyd və qalıqlar

+

★ ★ ★

+
    +
  • Bura bütün mövcud əmrlər deyil, ən vacibləri qeyd edilmişdir
    • +
  • Siz hələ də git və onun əmrlərini bildiyniz, normal qaydada istifadə edə bilərsiniz, git flow sadəcə alətlər toplusudur
    • +
  • 'support' imkanı hələ beta versiyasındadır, istifadəsi tövsiyə olunmur
    • +
  • Əgər siz tərcümələr təqdim etmək istəsəniz, onları qoşmaqda məmnun olaram
    • +
+

★ ★ ★

+
+
+ + + + + + + +comments powered by Disqus + + + + From abdb13a2b5d88119d6a95426e214daf88694094a Mon Sep 17 00:00:00 2001 From: Jahangir Shabiyev Date: Tue, 2 Aug 2016 04:07:17 +0400 Subject: [PATCH 104/106] Translation link is added --- index.ca_CA.html | 1 + index.de_DE.html | 1 + index.el_GR.html | 1 + index.es_ES.html | 1 + index.fr_FR.html | 1 + index.hr_HR.html | 1 + index.html | 1 + index.it_IT.html | 1 + index.ja_JP.html | 1 + index.ko_KR.html | 1 + index.nl_NL.html | 1 + index.pl_PL.html | 1 + index.pt_BR.html | 1 + index.ro_RO.html | 1 + index.ru_RU.html | 1 + index.tr_TR.html | 1 + index.uk_UK.html | 1 + index.vi_VN.html | 1 + index.zh_CN.html | 1 + index.zh_TW.html | 1 + 20 files changed, 20 insertions(+) diff --git a/index.ca_CA.html b/index.ca_CA.html index 9bf19bd..53bf4f7 100644 --- a/index.ca_CA.html +++ b/index.ca_CA.html @@ -67,6 +67,7 @@ Українська (Ukrainian) - Tiếng Việt (Vietnamese) - Polski + Azərbaycanca (Azerbaijani)

diff --git a/index.de_DE.html b/index.de_DE.html index 6f01a65..5bc1931 100644 --- a/index.de_DE.html +++ b/index.de_DE.html @@ -66,6 +66,7 @@ Українська (Ukrainian) - Tiếng Việt (Vietnamese) - Polski + Azərbaycanca (Azerbaijani)

diff --git a/index.el_GR.html b/index.el_GR.html index 9cce83c..7cc5c35 100644 --- a/index.el_GR.html +++ b/index.el_GR.html @@ -70,6 +70,7 @@ Українська (Ukrainian) - Tiếng Việt (Vietnamese) - Polski + Azərbaycanca (Azerbaijani)

diff --git a/index.es_ES.html b/index.es_ES.html index 648a0cd..2d202bb 100644 --- a/index.es_ES.html +++ b/index.es_ES.html @@ -65,6 +65,7 @@ Українська (Ukrainian) - Tiếng Việt (Vietnamese) - Polski + Azərbaycanca (Azerbaijani)

diff --git a/index.fr_FR.html b/index.fr_FR.html index ae2f4ab..a054613 100644 --- a/index.fr_FR.html +++ b/index.fr_FR.html @@ -66,6 +66,7 @@ Українська (Ukrainian) - Tiếng Việt (Vietnamese) - Polski + Azərbaycanca (Azerbaijani)

diff --git a/index.hr_HR.html b/index.hr_HR.html index 5d87a5f..061c7df 100644 --- a/index.hr_HR.html +++ b/index.hr_HR.html @@ -67,6 +67,7 @@ Tiếng Việt (Vietnamese) - Polski Hrvatski + Azərbaycanca (Azerbaijani)

diff --git a/index.html b/index.html index 4f2e0a6..7124ad7 100644 --- a/index.html +++ b/index.html @@ -66,6 +66,7 @@ Українська (Ukrainian) - Tiếng Việt (Vietnamese) - Polski + Azərbaycanca (Azerbaijani)

diff --git a/index.it_IT.html b/index.it_IT.html index 02013c4..d4d0a16 100644 --- a/index.it_IT.html +++ b/index.it_IT.html @@ -65,6 +65,7 @@ Ελληνικά (Greek) - Tiếng Việt (Vietnamese) - Polski + Azərbaycanca (Azerbaijani)

diff --git a/index.ja_JP.html b/index.ja_JP.html index 077e905..4d30225 100644 --- a/index.ja_JP.html +++ b/index.ja_JP.html @@ -66,6 +66,7 @@ Українська (Ukrainian) - Tiếng Việt (Vietnamese) - Polski + Azərbaycanca (Azerbaijani)

diff --git a/index.ko_KR.html b/index.ko_KR.html index 5a279f4..d7fe2a4 100644 --- a/index.ko_KR.html +++ b/index.ko_KR.html @@ -66,6 +66,7 @@ Українська (Ukrainian) - Tiếng Việt (Vietnamese) - Polski + Azərbaycanca (Azerbaijani)

diff --git a/index.nl_NL.html b/index.nl_NL.html index 8a26740..23db838 100644 --- a/index.nl_NL.html +++ b/index.nl_NL.html @@ -65,6 +65,7 @@ Українська (Ukrainian) - Tiếng Việt (Vietnamese) - Polski + Azərbaycanca (Azerbaijani)

diff --git a/index.pl_PL.html b/index.pl_PL.html index bcc87a3..be37997 100644 --- a/index.pl_PL.html +++ b/index.pl_PL.html @@ -70,6 +70,7 @@ Українська (Ukrainian) - Tiếng Việt (Vietnamese) - Polski + Azərbaycanca (Azerbaijani)

diff --git a/index.pt_BR.html b/index.pt_BR.html index e265e55..07f28de 100644 --- a/index.pt_BR.html +++ b/index.pt_BR.html @@ -49,6 +49,7 @@ Українська (Ukrainian) - Tiếng Việt (Vietnamese) - Polski + Azərbaycanca (Azerbaijani)

diff --git a/index.ro_RO.html b/index.ro_RO.html index 9a9cbee..f02c4c2 100644 --- a/index.ro_RO.html +++ b/index.ro_RO.html @@ -66,6 +66,7 @@ Українська (Ukrainian) - Tiếng Việt (Vietnamese) - Polski + Azərbaycanca (Azerbaijani)

diff --git a/index.ru_RU.html b/index.ru_RU.html index 48dc499..bb2f5f7 100644 --- a/index.ru_RU.html +++ b/index.ru_RU.html @@ -74,6 +74,7 @@ Українська (Ukrainian) - Tiếng Việt (Vietnamese) - Polski + Azərbaycanca (Azerbaijani)

diff --git a/index.tr_TR.html b/index.tr_TR.html index 06dffde..522e4a1 100644 --- a/index.tr_TR.html +++ b/index.tr_TR.html @@ -66,6 +66,7 @@ Українська (Ukrainian) - Tiếng Việt (Vietnamese) - Polski + Azərbaycanca (Azerbaijani)

diff --git a/index.uk_UK.html b/index.uk_UK.html index 60b06ac..a819f82 100644 --- a/index.uk_UK.html +++ b/index.uk_UK.html @@ -74,6 +74,7 @@ Українська (Ukrainian) - Tiếng Việt (Vietnamese) - Polski + Azərbaycanca (Azerbaijani)

diff --git a/index.vi_VN.html b/index.vi_VN.html index 3179fdf..4c6c334 100644 --- a/index.vi_VN.html +++ b/index.vi_VN.html @@ -66,6 +66,7 @@ Українська (Ukrainian) - Tiếng Việt (Vietnamese) - Polski + Azərbaycanca (Azerbaijani)

diff --git a/index.zh_CN.html b/index.zh_CN.html index 23ee1be..923fc4d 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -54,6 +54,7 @@ Українська (Ukrainian) - Tiếng Việt (Vietnamese) - Polski + Azərbaycanca (Azerbaijani)

diff --git a/index.zh_TW.html b/index.zh_TW.html index de6e2c9..698e081 100644 --- a/index.zh_TW.html +++ b/index.zh_TW.html @@ -56,6 +56,7 @@ Українська (Ukrainian) - Tiếng Việt (Vietnamese) - Polski + Azərbaycanca (Azerbaijani)

From 524b032e83342824422eb5a3ac2becdb5e0212d8 Mon Sep 17 00:00:00 2001 From: Jahangir Shabiyev Date: Tue, 2 Aug 2016 04:13:59 +0400 Subject: [PATCH 105/106] missed - --- index.ca_CA.html | 2 +- index.de_DE.html | 2 +- index.el_GR.html | 2 +- index.es_ES.html | 2 +- index.fr_FR.html | 2 +- index.hr_HR.html | 2 +- index.html | 2 +- index.it_IT.html | 2 +- index.ja_JP.html | 2 +- index.ko_KR.html | 2 +- index.nl_NL.html | 2 +- index.pl_PL.html | 2 +- index.pt_BR.html | 2 +- index.ro_RO.html | 2 +- index.ru_RU.html | 2 +- index.tr_TR.html | 2 +- index.uk_UK.html | 2 +- index.vi_VN.html | 2 +- index.zh_CN.html | 2 +- index.zh_TW.html | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/index.ca_CA.html b/index.ca_CA.html index 53bf4f7..5f15aba 100644 --- a/index.ca_CA.html +++ b/index.ca_CA.html @@ -66,7 +66,7 @@ Ελληνικά (Greek) - Українська (Ukrainian) - Tiếng Việt (Vietnamese) - - Polski + Polski - Azərbaycanca (Azerbaijani)

diff --git a/index.de_DE.html b/index.de_DE.html index 5bc1931..9212c93 100644 --- a/index.de_DE.html +++ b/index.de_DE.html @@ -65,7 +65,7 @@ Ελληνικά (Greek) - Українська (Ukrainian) - Tiếng Việt (Vietnamese) - - Polski + Polski - Azərbaycanca (Azerbaijani)

diff --git a/index.el_GR.html b/index.el_GR.html index 7cc5c35..d132536 100644 --- a/index.el_GR.html +++ b/index.el_GR.html @@ -69,7 +69,7 @@ Ελληνικά (Greek) - Українська (Ukrainian) - Tiếng Việt (Vietnamese) - - Polski + Polski - Azərbaycanca (Azerbaijani)

diff --git a/index.es_ES.html b/index.es_ES.html index 2d202bb..23937fc 100644 --- a/index.es_ES.html +++ b/index.es_ES.html @@ -64,7 +64,7 @@ Ελληνικά (Greek) - Українська (Ukrainian) - Tiếng Việt (Vietnamese) - - Polski + Polski - Azərbaycanca (Azerbaijani)

diff --git a/index.fr_FR.html b/index.fr_FR.html index a054613..2f4a9fe 100644 --- a/index.fr_FR.html +++ b/index.fr_FR.html @@ -65,7 +65,7 @@ Ελληνικά (Greek) - Українська (Ukrainian) - Tiếng Việt (Vietnamese) - - Polski + Polski - Azərbaycanca (Azerbaijani)

diff --git a/index.hr_HR.html b/index.hr_HR.html index 061c7df..5c4877b 100644 --- a/index.hr_HR.html +++ b/index.hr_HR.html @@ -66,7 +66,7 @@ Українська (Ukrainian) - Tiếng Việt (Vietnamese) - Polski - Hrvatski + Hrvatski - Azərbaycanca (Azerbaijani)

diff --git a/index.html b/index.html index 7124ad7..f096319 100644 --- a/index.html +++ b/index.html @@ -65,7 +65,7 @@ Ελληνικά (Greek) - Українська (Ukrainian) - Tiếng Việt (Vietnamese) - - Polski + Polski - Azərbaycanca (Azerbaijani)

diff --git a/index.it_IT.html b/index.it_IT.html index d4d0a16..eb33470 100644 --- a/index.it_IT.html +++ b/index.it_IT.html @@ -64,7 +64,7 @@ Română (Romanian) - Ελληνικά (Greek) - Tiếng Việt (Vietnamese) - - Polski + Polski - Azərbaycanca (Azerbaijani)

diff --git a/index.ja_JP.html b/index.ja_JP.html index 4d30225..7913fb7 100644 --- a/index.ja_JP.html +++ b/index.ja_JP.html @@ -65,7 +65,7 @@ Ελληνικά (Greek) - Українська (Ukrainian) - Tiếng Việt (Vietnamese) - - Polski + Polski - Azərbaycanca (Azerbaijani)

diff --git a/index.ko_KR.html b/index.ko_KR.html index d7fe2a4..3308be9 100644 --- a/index.ko_KR.html +++ b/index.ko_KR.html @@ -65,7 +65,7 @@ Ελληνικά (Greek) - Українська (Ukrainian) - Tiếng Việt (Vietnamese) - - Polski + Polski - Azərbaycanca (Azerbaijani)

diff --git a/index.nl_NL.html b/index.nl_NL.html index 23db838..8e4a783 100644 --- a/index.nl_NL.html +++ b/index.nl_NL.html @@ -64,7 +64,7 @@ Ελληνικά (Greek) - Українська (Ukrainian) - Tiếng Việt (Vietnamese) - - Polski + Polski - Azərbaycanca (Azerbaijani)

diff --git a/index.pl_PL.html b/index.pl_PL.html index be37997..b8e8afe 100644 --- a/index.pl_PL.html +++ b/index.pl_PL.html @@ -69,7 +69,7 @@ Ελληνικά (Greek) - Українська (Ukrainian) - Tiếng Việt (Vietnamese) - - Polski + Polski - Azərbaycanca (Azerbaijani)

diff --git a/index.pt_BR.html b/index.pt_BR.html index 07f28de..380e6a8 100644 --- a/index.pt_BR.html +++ b/index.pt_BR.html @@ -48,7 +48,7 @@ Ελληνικά (Greek) - Українська (Ukrainian) - Tiếng Việt (Vietnamese) - - Polski + Polski - Azərbaycanca (Azerbaijani)

diff --git a/index.ro_RO.html b/index.ro_RO.html index f02c4c2..4e32778 100644 --- a/index.ro_RO.html +++ b/index.ro_RO.html @@ -65,7 +65,7 @@ Ελληνικά (Greek) - Українська (Ukrainian) - Tiếng Việt (Vietnamese) - - Polski + Polski - Azərbaycanca (Azerbaijani)

diff --git a/index.ru_RU.html b/index.ru_RU.html index bb2f5f7..3c36937 100644 --- a/index.ru_RU.html +++ b/index.ru_RU.html @@ -73,7 +73,7 @@ Ελληνικά (Greek) - Українська (Ukrainian) - Tiếng Việt (Vietnamese) - - Polski + Polski - Azərbaycanca (Azerbaijani)

diff --git a/index.tr_TR.html b/index.tr_TR.html index 522e4a1..2accdb2 100644 --- a/index.tr_TR.html +++ b/index.tr_TR.html @@ -65,7 +65,7 @@ Ελληνικά (Greek) - Українська (Ukrainian) - Tiếng Việt (Vietnamese) - - Polski + Polski - Azərbaycanca (Azerbaijani)

diff --git a/index.uk_UK.html b/index.uk_UK.html index a819f82..f14c194 100644 --- a/index.uk_UK.html +++ b/index.uk_UK.html @@ -73,7 +73,7 @@ Ελληνικά (Greek) - Українська (Ukrainian) - Tiếng Việt (Vietnamese) - - Polski + Polski - Azərbaycanca (Azerbaijani)

diff --git a/index.vi_VN.html b/index.vi_VN.html index 4c6c334..8eb8d23 100644 --- a/index.vi_VN.html +++ b/index.vi_VN.html @@ -65,7 +65,7 @@ Ελληνικά (Greek) - Українська (Ukrainian) - Tiếng Việt (Vietnamese) - - Polski + Polski - Azərbaycanca (Azerbaijani)

diff --git a/index.zh_CN.html b/index.zh_CN.html index 923fc4d..dcabf2c 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -53,7 +53,7 @@ Ελληνικά (Greek) - Українська (Ukrainian) - Tiếng Việt (Vietnamese) - - Polski + Polski - Azərbaycanca (Azerbaijani)

diff --git a/index.zh_TW.html b/index.zh_TW.html index 698e081..1011e82 100644 --- a/index.zh_TW.html +++ b/index.zh_TW.html @@ -55,7 +55,7 @@ Ελληνικά (Greek) - Українська (Ukrainian) - Tiếng Việt (Vietnamese) - - Polski + Polski - Azərbaycanca (Azerbaijani)

From 066c39a834cf3d48f8591b8c2d746432a0a6cf1c Mon Sep 17 00:00:00 2001 From: Jahangir Shabiyev Date: Fri, 5 Aug 2016 13:09:17 +0400 Subject: [PATCH 106/106] Minor translation fixes and Linux installation issue fix #62 --- index.az_AZ.html | 8 ++++++-- index.html | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/index.az_AZ.html b/index.az_AZ.html index 1cdb3e2..09e5d24 100644 --- a/index.az_AZ.html +++ b/index.az_AZ.html @@ -116,9 +116,14 @@ $ port install git-flow-avh

Linux

+ Debian əsaslı distributivlər
$ apt-get install git-flow
+ Red Hat əsaslı distributivlər +
+ $ yum install gitflow +

Windows (Cygwin)

$ wget -q -O - --no-check-certificate @@ -128,7 +133,7 @@

- Git-flow'nun detallı quraşdırılma instruksiyaları üçün zəhmət olmasa git flow + Git-flow'nun detallı quraşdırılma addımları üçün zəhmət olmasa git flow wiki səhifəsinə daxil olun.

install git-flow @@ -325,7 +330,6 @@ git flow hotfix start VERSION [BASENAME]

ilə başlayır

-

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

Versiya arqumenti yeni düzəliş edilmiş buraxılış adını təyin edir. İstədiyiniz halda düzəlişə başlayacağınız BASENAME-kommiti göstərə bilərsiniz.

diff --git a/index.html b/index.html index f096319..c15a81c 100644 --- a/index.html +++ b/index.html @@ -119,9 +119,14 @@ $ port install git-flow-avh

Linux

+ Debian based distributives
$ apt-get install git-flow
+ Red Hat based distributives +
+ $ yum install gitflow +

Windows (Cygwin)

$ wget -q -O - --no-check-certificate