Skip to content

Add github-git-cheat-sheet in zh_TW #932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 26, 2022

Conversation

extend1994
Copy link
Contributor

Overview

TL;DR
Add github-git-cheat-sheet.md in zh_TW and update index.html accordingly.

Questions

No Questions :)

Next Steps

Wait for reviewers' opinions to decide the next steps.

Review

Hi @parkerbxyz @brianamarie, I noticed that you were handling the recent pull requests, so I tagged you here hoping that you can help review this PR. Hope that it doesn't bother you.

@extend1994 extend1994 changed the title GitHub git cheat sheet zh tw Add github-git-cheat-sheet in zh_TW Oct 23, 2022
Copy link
Member

@parkerbxyz parkerbxyz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, @extend1994! ✨

@parkerbxyz parkerbxyz merged commit e801b3b into github:main Oct 26, 2022
---

{% capture colOne %}
## 安装 Git

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is subtle, but the "装" here is actually Simplified Chinese. You may use "裝" instead.


```$ git branch -d [branch-name]```

删除指定分支

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"删" seems to be Simplified Chinese too. You may use "刪" instead.


複製 (clone) 一個存在 GitHub 上的倉儲到本機端,其中包含所有檔案、分支與提交(commits)

## .gitignore 文件

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It means ".gitignore file" which should be ".gitignore 檔".


## 同步更改

將本地端的 Git 倉儲與遠端的 GitHub 倉儲進行狀態同步

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please beware of consistency, so it may be "本機端".


```$ git merge```

將遠端分支合併到當前本地端的分支
Copy link

@ralphchung ralphchung Oct 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above.


```$ git push```

將當前本地端的分支上傳到 GitHub

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above.


```$ git pull```

讀取 GitHub 遠端分支的對應提交,來更新使用者本地端當前的分支。當使用者接連著下達 `git fetch` 和 `git merge` 的指令,效果等同於直接下達 `git pull` 指令。

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above.


```$ git add [file]```

對文件進行快照,以讓 Git 納入版本控制

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be 檔案


```$ git reset [commit]```

撤銷所有 `[commit]` 後的提交,並在本地端先保留該撤銷內容

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe "revert" is usually translated to "復原", but it is up to you.


```$ git reset [commit]```

撤銷所有 `[commit]` 後的提交,並在本地端先保留該撤銷內容

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And "本機" consistency


```$ git reset --hard [commit]```

撤銷並抹除所有 `[commit]` 後的提交

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above.


撤銷並抹除所有 `[commit]` 後的提交

> 特別注意!修改版本控制紀錄可能造成不好的後果。如果你需要修改遠端 GitHub 既有的提交,請小心操作。如果你需要幫助,可在社群 [github.community](https://github.community) 提出,或連繫 GitHub 窗口。

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Contact support" should be "尋求支援" or something similar. No matter what, the word itself should be "聯絡" or "聯繫".

## 術語清單

- **git**: 一個開源的分散式版本控制系統
- **GitHub**: 一個讓使用者在使用本地端 Git 時,可進行遠端託管和協作管理的平台

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above.

@parkerbxyz
Copy link
Member

Thanks for the review, @ralphchung! Would you be able to open a pull request with your suggested changes?

extend1994 added a commit to extend1994/training-kit that referenced this pull request Oct 29, 2022
@extend1994
Copy link
Contributor Author

Hi @parkerbxyz, I opened #937 for the above suggestions, feel free to review it 😃

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants