From a09df51e1fbc4c37492449d8e18b7c69b4238317 Mon Sep 17 00:00:00 2001 From: Yue Lin Ho Date: Sun, 24 Apr 2016 17:36:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=AC=AC=E4=B8=89=E7=AB=A0=20=E7=AC=AC?= =?UTF-8?q?=E4=B8=89=E7=AF=80=20=E5=88=86=E6=94=AF=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sections/branch-management.asc | 28 +++++++++---------- status.json | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/book/03-git-branching/sections/branch-management.asc b/book/03-git-branching/sections/branch-management.asc index a99b060..556e301 100644 --- a/book/03-git-branching/sections/branch-management.asc +++ b/book/03-git-branching/sections/branch-management.asc @@ -2,10 +2,10 @@ === 分支管理 (((branches, managing))) -Now that you've created, merged, and deleted some branches, let's look at some branch-management tools that will come in handy when you begin using branches all the time. +到目前為止，你已經建立過、合併過和刪除過分支；讓我們再來看一些分支管理工具，隨著你不斷地使用分支功能，它們會讓你工作得更順手。 -The `git branch` command does more than just create and delete branches.(((git commands, branch))) -If you run it with no arguments, you get a simple listing of your current branches: +`git branch` 命令不僅能建立和刪除分支，(((git commands, branch))) +如果不加任何參數，你會得到一份簡單的列表列出目前所有分支： [source,console] ---- @@ -15,9 +15,9 @@ $ git branch testing ---- -Notice the `*` character that prefixes the `master` branch: it indicates the branch that you currently have checked out (i.e., the branch that `HEAD` points to). -This means that if you commit at this point, the `master` branch will be moved forward with your new work. -To see the last commit on each branch, you can run `git branch -v`: +注意 `master` 分支前面有一個 `*` 字元，它表示目前所檢出的分支（換句話說，`HEAD` 指向這個分支）； +這意謂著如果你現在提交，`master` 分支將隨著向前移動。 +若要查看各個分支最後一個提交資訊，執行 `git branch -v`： [source,console] ---- @@ -27,8 +27,8 @@ $ git branch -v testing 782fd34 add scott to the author list in the readmes ---- -The useful `--merged` and `--no-merged` options can filter this list to branches that you have or have not yet merged into the branch you're currently on. -To see which branches are already merged into the branch you're on, you can run `git branch --merged`: +要從該清單中篩選出「已經」或「尚未」與目前分支合併的分支，分別可以用 `--merged` 和 `--no-merged` 選項。 +使用 `git branch --merged` 來查看哪些分支已被合併到目前分支： [source,console] ---- @@ -37,10 +37,10 @@ $ git branch --merged * master ---- -Because you already merged in `iss53` earlier, you see it in your list. -Branches on this list without the `*` in front of them are generally fine to delete with `git branch -d`; you've already incorporated their work into another branch, so you're not going to lose anything. +由於之前的 `iss53` 已經被合併了，所以會在列表中看到它； +列表中沒有被標記 `*` 的分支通常都可以用 `git branch -d` 刪除；你已經把它們的工作內容整併到其他分支，所以刪掉它們也不會有所損失。 -To see all the branches that contain work you haven't yet merged in, you can run `git branch --no-merged`: +使用 `git branch --no-merged` 來查看哪些分支的工作尚未被合併： [source,console] ---- @@ -48,8 +48,8 @@ $ git branch --no-merged testing ---- -This shows your other branch. -Because it contains work that isn't merged in yet, trying to delete it with `git branch -d` will fail: +這顯示了你其它的分支； +由於它包含了尚未被合併進來的工作內容，用 `git branch -d` 刪除該分支將會失敗： [source,console] ---- @@ -58,4 +58,4 @@ error: The branch 'testing' is not fully merged. If you are sure you want to delete it, run 'git branch -D testing'. ---- -If you really do want to delete the branch and lose that work, you can force it with `-D`, as the helpful message points out. +如果你確實想要刪除該分支並丟掉那個工作成果，可以用 `-D` 選項（譯註：大寫的 D）來強制執行，就像上面訊息中所提示的。 diff --git a/status.json b/status.json index 631d636..d73a26c 100644 --- a/status.json +++ b/status.json @@ -26,7 +26,7 @@ "03-git-branching": { "1-git-branching.asc": 100, "sections/basic-branching-and-merging.asc": 100, - "sections/branch-management.asc": 1, + "sections/branch-management.asc": 100, "sections/nutshell.asc": 100, "sections/rebasing.asc": 1, "sections/remote-branches.asc": 1, From 3ce3d3e9a23030133de1d66827d9ea64c6edd412 Mon Sep 17 00:00:00 2001 From: Yue Lin Ho Date: Sun, 24 Apr 2016 22:50:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=82=BA=20Git=20=E6=8C=87=E4=BB=A4?= =?UTF-8?q?=E5=92=8C=E8=A1=93=E8=A9=9E=E5=8A=A0=E4=B8=8A=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E9=99=84=E8=A8=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- book/03-git-branching/sections/branch-management.asc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/book/03-git-branching/sections/branch-management.asc b/book/03-git-branching/sections/branch-management.asc index 556e301..f91223b 100644 --- a/book/03-git-branching/sections/branch-management.asc +++ b/book/03-git-branching/sections/branch-management.asc @@ -2,7 +2,7 @@ === 分支管理 (((branches, managing))) -到目前為止，你已經建立過、合併過和刪除過分支；讓我們再來看一些分支管理工具，隨著你不斷地使用分支功能，它們會讓你工作得更順手。 +到目前為止，你已經建立過、合併過和刪除過分支（branch）；讓我們再來看一些分支管理工具，隨著你不斷地使用分支功能，它們會讓你工作得更順手。 `git branch` 命令不僅能建立和刪除分支，(((git commands, branch))) 如果不加任何參數，你會得到一份簡單的列表列出目前所有分支： @@ -15,7 +15,7 @@ $ git branch testing ---- -注意 `master` 分支前面有一個 `*` 字元，它表示目前所檢出的分支（換句話說，`HEAD` 指向這個分支）； +注意 `master` 分支前面有一個 `*` 字元，它表示目前所檢出（checkout）的分支（換句話說，`HEAD` 指向這個分支）； 這意謂著如果你現在提交，`master` 分支將隨著向前移動。 若要查看各個分支最後一個提交資訊，執行 `git branch -v`：