Skip to content

Commit ddf09f5

Browse files
committed
Update root files
1 parent 9fb8610 commit ddf09f5

14 files changed

+56
-41
lines changed
File renamed without changes.

BASE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
progit/progit2@e95aba0b236ab57b8ea9a1ef1b4fdae6339573ec
1+
progit/progit2@3f41625

ch01-introduction.asc renamed to ch01-getting-started.asc

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
[#ch01-introduction]
2-
[[r_getting_started]]
1+
[[ch01-getting-started]]
32
//////////////////////////
43
== Getting Started
54
//////////////////////////
@@ -34,7 +33,7 @@ include::book/01-introduction/sections/help.asc[]
3433
=== 요약
3534
3635
//////////////////////////
37-
You should have a basic understanding of what Git is and how it's different from the centralized version control system you may have previously been using.
36+
You should have a basic understanding of what Git is and how it's different from any centralized version control systems you may have been using previously.
3837
You should also now have a working version of Git on your system that's set up with your personal identity.
3938
It's now time to learn some Git basics.
4039
//////////////////////////

ch02-git-basics.asc renamed to ch02-git-basics-chapter.asc

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
[#ch02-git-basics]
2-
[[r_git_basics_chapter]]
1+
[[ch02-git-basics-chapter]]
32
//////////////////////////
43
== Git Basics
54
//////////////////////////
@@ -36,7 +35,7 @@ include::book/02-git-basics/sections/aliases.asc[]
3635
=== 요약
3736
3837
//////////////////////////
39-
At this point, you can do all the basic local Git operations creating or cloning a repository, making changes, staging and committing those changes, and viewing the history of all the changes the repository has been through.
38+
At this point, you can do all the basic local Git operations -- creating or cloning a repository, making changes, staging and committing those changes, and viewing the history of all the changes the repository has been through.
4039
Next, we'll cover Git's killer feature: its branching model.
4140
//////////////////////////
4241
이제 우리는 로컬에서 사용할 수 있는 Git 명령에 대한 기본 지식은 갖추었다. 저장소를 만들고 Clone 하는 방법, 수정하고 나서 Stage 하고 커밋하는 방법, 저장소의 히스토리를 조회하는 방법 등을 살펴보았다.

ch03-git-branching.asc

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
[#ch03-git-branching]
2-
[[r_git_branching]]
1+
[[ch03-git-branching]]
32
//////////////////////////
43
== Git Branching
54
//////////////////////////

ch04-git-server.asc renamed to ch04-git-on-the-server.asc

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[#ch04-git-server]
1+
[[ch04-git-on-the-server]]
22
//////////////////////////
33
== Git on the Server
44
//////////////////////////
@@ -9,7 +9,7 @@
99
At this point, you should be able to do most of the day-to-day tasks for which you'll be using Git.
1010
However, in order to do any collaboration in Git, you'll need to have a remote Git repository.
1111
Although you can technically push changes to and pull changes from individuals' repositories, doing so is discouraged because you can fairly easily confuse what they're working on if you're not careful.
12-
Furthermore, you want your collaborators to be able to access the repository even if your computer is offline having a more reliable common repository is often useful.
12+
Furthermore, you want your collaborators to be able to access the repository even if your computer is offline -- having a more reliable common repository is often useful.
1313
Therefore, the preferred method for collaborating with someone is to set up an intermediate repository that you both have access to, and push to and pull from that.
1414
//////////////////////////
1515
이 글을 읽는 독자라면 이미 하루 업무의 대부분을 Git으로 처리할 수 있을 거라고 생각한다.
@@ -39,7 +39,7 @@ If you have no interest in running your own server, you can skip to the last sec
3939
서버를 직접 설치해서 운영할 생각이 없으면 이 장의 마지막 절만 읽어도 된다. 마지막 절에서는 Git 호스팅 서비스에 계정을 만들고 사용하는 방법에 대해 설명한다. 그리고 다음 장에서는 분산 환경에서 소스를 관리하는 다양한 패턴에 대해 논의할 것이다.
4040
4141
//////////////////////////
42-
A remote repository is generally a _bare repository_ a Git repository that has no working directory.
42+
A remote repository is generally a _bare repository_ -- a Git repository that has no working directory.
4343
Because the repository is only used as a collaboration point, there is no reason to have a snapshot checked out on disk; it's just the Git data.
4444
In the simplest terms, a bare repository is the contents of your project's `.git` directory and nothing else.
4545
//////////////////////////

ch05-distributed-git.asc

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
[#ch05-distributed-git]
2-
[[r_distributed_git]]
1+
[[ch05-distributed-git]]
32
//////////////////////////
43
== Distributed Git
54
//////////////////////////
65
== 분산 환경에서의 Git
76
87
(((distributed git)))
98
//////////////////////////
10-
Now that you have a remote Git repository set up as a point for all the developers to share their code, and you're familiar with basic Git commands in a local workflow, you'll look at how to utilize some of the distributed workflows that Git affords you.
9+
Now that you have a remote Git repository set up as a focal point for all the developers to share their code, and you're familiar with basic Git commands in a local workflow, you'll look at how to utilize some of the distributed workflows that Git affords you.
1110
//////////////////////////
1211
앞 장에서 다른 개발자와 코드를 공유하는 리모트 저장소를 만드는 법을 배웠다. 로컬에서 작업하는 데 필요한 기본적인 명령어에는 어느 정도 익숙해졌다. 이제는 분산 환경에서 Git이 제공하는 기능을 어떻게 효율적으로 사용할지를 배운다.
1312

ch06-github.asc

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
[#ch06-github]
2-
[[r_github]]
1+
[[ch06-github]]
32
== GitHub
43

54
(((GitHub)))

ch07-git-tools.asc

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
[#ch07-git-tools]
2-
[[r_git_tools]]
1+
[[ch07-git-tools]]
32
//////////////////////////
43
== Git Tools
54
//////////////////////////

ch08-customizing-git.asc

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
[#ch08-customizing-git]
2-
[[r_customizing_git]]
1+
[[ch08-customizing-git]]
32
//////////////////////////
43
== Customizing Git
54
//////////////////////////

ch09-git-and-other-scms.asc renamed to ch09-git-and-other-systems.asc

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[#ch09-git-and-other-scms]
1+
[[ch09-git-and-other-systems]]
22
//////////////////////////
33
== Git and Other Systems
44
//////////////////////////
@@ -41,11 +41,13 @@ include::book/09-git-and-other-scms/sections/client-svn.asc[]
4141
4242
include::book/09-git-and-other-scms/sections/client-hg.asc[]
4343
44+
include::book/09-git-and-other-scms/sections/client-bzr.asc[]
45+
4446
include::book/09-git-and-other-scms/sections/client-p4.asc[]
4547
4648
include::book/09-git-and-other-scms/sections/client-tfs.asc[]
4749
48-
[[r_migrating]]
50+
[[_migrating]]
4951
//////////////////////////
5052
=== Migrating to Git
5153
//////////////////////////
@@ -65,6 +67,8 @@ include::book/09-git-and-other-scms/sections/import-svn.asc[]
6567
6668
include::book/09-git-and-other-scms/sections/import-hg.asc[]
6769
70+
include::book/09-git-and-other-scms/sections/import-bzr.asc[]
71+
6872
include::book/09-git-and-other-scms/sections/import-p4.asc[]
6973
7074
include::book/09-git-and-other-scms/sections/import-tfs.asc[]

ch10-git-internals.asc

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
[#ch10-git-internals]
2-
[[r_git_internals]]
1+
[[ch10-git-internals]]
32
//////////////////////////
43
== Git Internals
54
//////////////////////////
65
== Git의 내부
76
87
//////////////////////////
9-
You may have skipped to this chapter from a previous chapter, or you may have gotten here after reading the rest of the book – in either case, this is where we'll go over the inner workings and implementation of Git.
10-
We found that learning this information was fundamentally important to understanding how useful and powerful Git is, but others have argued to us that it can be confusing and unnecessarily complex for beginners.
8+
You may have skipped to this chapter from a much earlier chapter, or you may have gotten here after sequentially reading the entire book up to this point -- in either case, this is where we'll go over the inner workings and implementation of Git.
9+
We found that understanding this information was fundamentally important to appreciating how useful and powerful Git is, but others have argued to us that it can be confusing and unnecessarily complex for beginners.
1110
Thus, we've made this discussion the last chapter in the book so you could read it early or later in your learning process.
1211
We leave it up to you to decide.
1312
//////////////////////////
@@ -27,13 +26,13 @@ You'll learn more about what this means in a bit.
2726
2827
//////////////////////////
2928
In the early days of Git (mostly pre 1.5), the user interface was much more complex because it emphasized this filesystem rather than a polished VCS.
30-
In the last few years, the UI has been refined until it's as clean and easy to use as any system out there; but often, the stereotype lingers about the early Git UI that was complex and difficult to learn.
29+
In the last few years, the UI has been refined until it's as clean and easy to use as any system out there; however, the stereotype lingers about the early Git UI that was complex and difficult to learn.
3130
//////////////////////////
3231
Git 초기에는 (1.5 이전 버전) 사용자 인터페이스가 훨씬 복잡했었다. VCS가 아니라 파일 시스템을 강조했기 때문이었다.
3332
최근 몇 년간 Git은 다른 VCS처럼 쉽고 간결하게 사용자 인터페이스를 다듬어 왔다. 하지만, 여전히 복잡하고 배우기 어렵다는 선입견이 있다.
3433
3534
//////////////////////////
36-
The content-addressable filesystem layer is amazingly cool, so I'll cover that first in this chapter; then, you'll learn about the transport mechanisms and the repository maintenance tasks that you may eventually have to deal with.
35+
The content-addressable filesystem layer is amazingly cool, so we'll cover that first in this chapter; then, you'll learn about the transport mechanisms and the repository maintenance tasks that you may eventually have to deal with.
3736
//////////////////////////
3837
우선 Content-addressable 파일 시스템은 정말 대단한 것이므로 먼저 다룬다. 그리고 나서 데이터 전송 원리를 배우고 마지막에는 저장소를 관리하는 법까지 배운다.
3938
@@ -59,9 +58,9 @@ include::book/10-git-internals/sections/environment.asc[]
5958
=== 요약
6059
6160
//////////////////////////
62-
You should have a pretty good understanding of what Git does in the background and, to some degree, how it's implemented.
63-
This chapter has covered a number of plumbing commands commands that are lower level and simpler than the porcelain commands you've learned about in the rest of the book.
64-
Understanding how Git works at a lower level should make it easier to understand why it's doing what it's doing and also to write your own tools and helping scripts to make your specific workflow work for you.
61+
At this point, you should have a pretty good understanding of what Git does in the background and, to some degree, how it's implemented.
62+
This chapter has covered a number of plumbing commands -- commands that are lower level and simpler than the porcelain commands you've learned about in the rest of the book.
63+
Understanding how Git works at a lower level should make it easier to understand why it's doing what it's doing and also to write your own tools and helper scripts to make your specific workflow work for you.
6564
//////////////////////////
6665
Git이 내부적으로 어떻게 동작하는지 뿐만 아니라 어떻게 구현됐는지까지 잘 알게 됐을 것이다.
6766
이 장에서는 저수준 명령어인 Plumbing 명령어를 설명했다. 다른 장에서 우리가 배웠던 Porcelain 명령어보다는 단순하다.

progit.asc

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
Pro Git
22
=======
3-
Scott Chacon, Ben Straub
3+
Scott Chacon; Ben Straub
44
$$VERSION$$, $$DATE$$
55
:doctype: book
66
:docinfo:
77
:toc:
88
:toclevels: 2
99
:pagenums:
1010
:front-cover-image: image:book/cover.png[width=1050,height=1600]
11-
:lang: ko
11+
:icons: font
1212

1313
ifdef::ebook-format[:leveloffset: -1]
1414

1515
include::book/license.asc[]
1616

17-
include::book/preface_scott.asc[]
17+
include::book/preface_schacon.asc[]
1818

1919
include::book/preface_ben.asc[]
2020

2121
include::book/dedication.asc[]
2222

23-
//include::book/contributors.asc[]
23+
include::book/contributors.asc[]
2424

2525
include::book/introduction.asc[]
2626

27-
include::ch01-introduction.asc[]
27+
include::ch01-getting-started.asc[]
2828

29-
include::ch02-git-basics.asc[]
29+
include::ch02-git-basics-chapter.asc[]
3030

3131
include::ch03-git-branching.asc[]
3232

33-
include::ch04-git-server.asc[]
33+
include::ch04-git-on-the-server.asc[]
3434

3535
include::ch05-distributed-git.asc[]
3636

@@ -40,13 +40,13 @@ include::ch07-git-tools.asc[]
4040

4141
include::ch08-customizing-git.asc[]
4242

43-
include::ch09-git-and-other-scms.asc[]
43+
include::ch09-git-and-other-systems.asc[]
4444

4545
include::ch10-git-internals.asc[]
4646

4747
include::A-git-in-other-environments.asc[]
4848

49-
include::B-embedding-git.asc[]
49+
include::B-embedding-git-in-your-applications.asc[]
5050

5151
include::C-git-commands.asc[]
5252

script/tag_on_master

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/bash
2+
3+
# This is for running on Travis. It automatically tags any merge to Master as a release in the 2.1.x series.
4+
if [[ $TRAVIS_PULL_REQUEST != 'false' || "$TRAVIS_BRANCH" != 'master' ]]; then
5+
# Don't run on pull requests
6+
echo 'This only runs on a merge to master.'
7+
exit 0
8+
fi
9+
10+
# Compute the next tag number
11+
LASTPATCH=$(git describe --tags | cut -d- -f1 | cut -d. -f3)
12+
PATCH=$(($LASTPATCH+1))
13+
echo $PATCH
14+
15+
# Create a tag
16+
curl -H "Authorization: token $GITHUB_KEY" \
17+
-X POST \
18+
-d "{\"ref\":\"refs/tags/2.1.$PATCH\", \"sha\":\"$TRAVIS_COMMIT\"}" \
19+
https://api.github.com/repos/progit/progit2/git/refs

0 commit comments

Comments
 (0)