8000 Merge pull request #38 from marocchino/korean · KChernenko/github-cheat-sheet@fd092f3 · GitHub
[go: up one dir, main page]
Skip to content

Commit fd092f3

Browse files
author
Rafal Chmiel
committed
Merge pull request tiimgreen#38 from marocchino/korean
Update korean, localize language switcher
2 parents ecf6946 + 2a18c4c commit fd092f3

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

‎README.ja.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# GitHubカンニング・ペーパー
22
これはGitやGitHubの隠された機能やよく知られていない機能の一覧だ。[Zach Holman](https://github.com/holman)によるAloha Ruby Conference 2012での[Git and GitHub Secrets](https://github.com/tiimgreen/github-cheat-sheet)（[スライド](https://github.com/tiimgreen/github-cheat-sheet)）とWDCNZ 2013での[More Git and GitHub Secrets](https://vimeo.com/72955426)（[スライド](https://speakerdeck.com/holman/more-git-and-github-secrets)）の二つのトークを元にしている。
33

4+
*Read this in other languages: [English](README.md), [한국어](README.ko.md), [日本語](README.ja.md).*
5+
46
# 目次
57
- [GitHub](#github)
68
- [空白の無視](#%E7%A9%BA%E7%99%BD%E3%81%AE%E7%84%A1%E8%A6%96)

‎README.ko.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
A collection of cool hidden and not so hidden features of Git and GitHub. This cheat sheet was inspired by [Zach Holman](https://github.com/holman)'s [Git and GitHub Secrets](http://www.confreaks.com/videos/1229-aloharuby2012-git-and-github-secrets) talk at Aloha Ruby Conference 2012 ([slides](https://speakerdeck.com/holman/git-and-github-secrets)) and his [More Git and GitHub Secrets](https://vimeo.com/72955426) talk at WDCNZ 2013 ([slides](https://speakerdeck.com/holman/more-git-and-github-secrets)).
44

5+
*Read this in other languages: [English](README.md), [한국어](README.ko.md), [日本語](README.ja.md).*
6+
57
# 목록
68

79
- [GitHub](#github)
@@ -75,7 +77,7 @@ diff나 파일 URL에 `?ts=4`를 덧붙이면 텝 문자의 크기를 기본값
7577
![Before, tab space example](http://i.imgur.com/GIT1Fr0.png)
7678

7779
그리고 `?ts=4`를 붙인 [다음에는](https://github.com/pengwynn/flint/blob/master/flint/flint.go?ts=4) 이렇게 됩니다.
78-
80+
--allow-empty
7981
![After, tab space example](http://i.imgur.com/70FL4H9.png)
8082

8183
### Commit History by Author
@@ -220,12 +222,12 @@ https://github.com/rails/rails/blob/master/activemodel/lib/active_model.rb#L53-L
220222
어떤 커밋이 이슈를 고쳤다면, `fix/fixes/fixed`, `close/closes/closed`, `resolve/resolves/resolved`를 키워드로 해당 이슈가 마스터 브랜치에 커밋 될 때 닫을 수 있습니다.
221223

222224
```bash
223-
$ git commit -m "Fix cock up, fixes #12"
225+
$ git commit -m "Fix screwup, fixes #12"
224226
```
225227

226228
이렇게 하면 이슈를 닫고 클로징 커맨트로 참조하게 합니다.
227229

228-
![Closing Repo](http://i.imgur.com/URXFprQ.png)
230+
![Closing Repo](http://i.imgur.com/Uh1gZdx.png)
229231

230232
[*커밋 메세지로 이슈 닫기에 대해 더 읽어 보세요.*](https://help.github.com/articles/closing-issues-via-commit-messages)
231233

@@ -612,6 +614,7 @@ $ git commit -m "Big-ass commit" --allow-empty
612614
- 한 뭉치의 일을 시작하기 전에 주석으로 사용
613615
- 코드와 관련없는 프로젝트 수정을 할때 주석으로 사용
614616
- 저장소를 사용하는 사람과의 대화
617+
- 나중에 리베이스하지 않을 저장소의 첫 커밋으로 사용 `git commit -m "init repo" --allow-empty`.
615618

616619
### Styled Git Status
617620

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# GitHub Cheat Sheet
22
A collection of cool hidden and not so hidden features of Git and GitHub. This cheat sheet was inspired by [Zach Holman](https://github.com/holman)'s [Git and GitHub Secrets](http://www.confreaks.com/videos/1229-aloharuby2012-git-and-github-secrets) talk at Aloha Ruby Conference 2012 ([slides](https://speakerdeck.com/holman/git-and-github-secrets)) and his [More Git and GitHub Secrets](https://vimeo.com/72955426) talk at WDCNZ 2013 ([slides](https://speakerdeck.com/holman/more-git-and-github-secrets)).
33

4-
*Read this in [Korean](README.ko.md) or [Japanese](README.ja.md).*
4+
*Read this in other languages: [English](README.md), [한국어](README.ko.md), [日本語](README.ja.md).*
55

66
## Table of Contents
77
- [GitHub](#github)

0 commit comments

Comments
 (0)
0