5ac1dd9 是一个 Merge Commit，将其放入 PR 并最终引入主干历史是不合理的，
其实我们需要的仅仅是 8923958 。

为了去掉 5ac1dd9 同时实现 sync，就目前情况，可以如下操作：

git checkout master
# Here I assume your "progit2-zh" remote is named "upstream"
git pull --ff-only upstream master
git checkout 02-git-basics-getting-a-repository
git reset --hard master
git cherry-pick 8923958
git push --force origin 02-git-basics-getting-a-repository

On Tue, 25 Aug 2015, BranchZero Sun wrote:

You can view, comment on, or merge this pull request online at:

#280

-- Commit Summary --

• Merge pull request Start Chapter 2 #1 from progit/master
• Improve Translation

-- File Changes --

M book/02-git-basics/sections/getting-a-repository.asc (54)

-- Patch Links --

https://github.com/progit/progit2-zh/pull/280.patch
https://github.com/progit/progit2-zh/pull/280.diff

---

Reply to this email directly or view it on GitHub:
#280

@oldsharp 了解，待会儿处理，谢谢指教：）