diff --git a/index.zh_CN.html b/index.zh_CN.html index a9eacd0..a786f78 100644 --- a/index.zh_CN.html +++ b/index.zh_CN.html @@ -1,16 +1,14 @@ - + - git-flow cheatsheet + git-flow 备忘清单 - - + 由 Daniel Kummer (Tweet) 创建 +

-

efficient branching using git-flow by Vincent Driessen

-

translations: - English - +

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

+

翻译: + English - Castellano - Brazilian Portugues - - 繁體中文(Traditional Chinese) - - 简体中文(Simplified Chinese) - + 简体中文(Simplified Chinese) 日本語 - Türkçe - 한국어(Korean) - @@ -59,8 +47,7 @@ Italiano - Nederlands - Русский (Russian) - - Deutsch (German) - - Català (Catalan) + Deutsch (German)

@@ -68,38 +55,35 @@
-

About

+

关于

- git-flow are a set of git extensions to provide high-level repository operations for Vincent - Driessen's branching model. - more + git-flow 是一个 git 扩展集，按 Vincent Driessen 的分支模型提供高层次的库操作。 + 查看详情

★ ★ ★

-

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

+

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

★ ★ ★

-

Basic tips

+

基础建议

★ ★ ★

-

Setup

+

安装

★ ★ ★

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

+

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

- For detailed git flow intallation instructions please visit the git flow - wiki. + 更多的 git flow 安装指引，请阅读 git flow wiki.

install git-flow
-

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,33 +141,22 @@
-

Features

+

特性

★ ★ ★

-

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'的特性分支，并切换到这个分支之下。

@@ -194,16 +165,14 @@
-

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
    • +
  • 合并 MYFEATURE 分支到 'develop'
    • +
  • 删除这个新特性分支
    • +
  • 切换回 'develop' 分支
@@ -217,11 +186,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. + 你是否合作开发一项新特性？
+ 发布新特性分支到远程服务器，所以，其它用户也可以使用这分支。

@@ -235,17 +204,15 @@
-

Getting a published feature

+

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

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

- 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 +221,29 @@
-

Make a release

+

作一个release版本

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

★ ★ ★

-

Start a release

+

开始准备release版本

-

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

+

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

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

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.

+

你可以选择提供一个 [BASE]参数，即提交记录的 sha-1 hash 值，来开启动 release 分支. 这个提交记录的 sha-1 hash 值必须是'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:

+

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

git flow release publish RELEASE
-

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

+

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

@@ -285,20 +252,18 @@
-

Finish up a release

+

完成 release 版本

-

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

+

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

    -
  • Merges the release branch back into 'master'
    • -
  • Tags the release with its name
    • -
  • Back-merges the release into 'develop'
    • -
  • Removes the release branch
    • +
  • 归并 release 分支到 'master' 分支
    • +
  • 用 release 分支名打 Tag
    • +
  • 归并 release 分支到 'develop'
    • +
  • 移除 release 分支
git flow release finish RELEASE
-

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

-
@@ -307,22 +272,21 @@
-

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

★ ★ ★

-

git flow hotfix start

+

开始 git flow 紧急修复

-

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

+

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

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.

+

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

@@ -331,9 +295,9 @@
-

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.

+

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

git flow hotfix finish VERSION
@@ -353,7 +317,7 @@
-

Commands

+

命令

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

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

★ ★ ★

@@ -381,7 +343,6 @@
-