diff --git a/BASE.md b/BASE.md new file mode 100644 index 00000000..36893ebb --- /dev/null +++ b/BASE.md @@ -0,0 +1 @@ +progit/progit2@f61c80195466a84ecda9b0cb5eacf473fc021459 diff --git a/book/01-introduction/images/areas.png b/book/01-introduction/images/areas.png index 0aa4975e..209bc197 100644 Binary files a/book/01-introduction/images/areas.png and b/book/01-introduction/images/areas.png differ diff --git a/book/01-introduction/images/centralized.png b/book/01-introduction/images/centralized.png index 03fe1b5c..e8d103ab 100644 Binary files a/book/01-introduction/images/centralized.png and b/book/01-introduction/images/centralized.png differ diff --git a/book/01-introduction/images/deltas.png b/book/01-introduction/images/deltas.png index 14772d7f..b914131e 100644 Binary files a/book/01-introduction/images/deltas.png and b/book/01-introduction/images/deltas.png differ diff --git a/book/01-introduction/images/distributed.png b/book/01-introduction/images/distributed.png index c45643ae..572552cd 100644 Binary files a/book/01-introduction/images/distributed.png and b/book/01-introduction/images/distributed.png differ diff --git a/book/01-introduction/images/git-osx-installer.png b/book/01-introduction/images/git-osx-installer.png index b5b17d78..7490d693 100644 Binary files a/book/01-introduction/images/git-osx-installer.png and b/book/01-introduction/images/git-osx-installer.png differ diff --git a/book/01-introduction/images/local.png b/book/01-introduction/images/local.png index 6bcf6d15..abb473d0 100644 Binary files a/book/01-introduction/images/local.png and b/book/01-introduction/images/local.png differ diff --git a/book/01-introduction/images/snapshots.png b/book/01-introduction/images/snapshots.png index f6d9162f..82eb324f 100644 Binary files a/book/01-introduction/images/snapshots.png and b/book/01-introduction/images/snapshots.png differ diff --git a/book/01-introduction/sections/about-version-control.asc b/book/01-introduction/sections/about-version-control.asc index 627a1cf0..7081dcf4 100644 --- a/book/01-introduction/sections/about-version-control.asc +++ b/book/01-introduction/sections/about-version-control.asc @@ -119,12 +119,12 @@ Local VCS systems suffer from this same problem – whenever you have the entire This is where Distributed Version Control Systems (DVCSs) step in. In a DVCS (such as Git, Mercurial, Bazaar or Darcs), clients don't just check out the latest snapshot of the files: they fully mirror the repository. Thus if any server dies, and these systems were collaborating via it, any of the client repositories can be copied back up to the server to restore it. -Every checkout is really a full backup of all the data. +Every clone is really a full backup of all the data. ////////////////////////// DVCS(분산 버전 관리 시스템)을 설명할 차례다. Git, Mecurial, Bazaar, Darcs 같은 DVCS에서의 클라이언트는 단순히 파일의 마지막 스냅샷을 Checkout하지 않는다. 그냥 저장소를 전부 복제한다. 서버에 문제가 생기면 이 복제물로 다시 작업을 시작할 수 있다. 클라이언트 중에서 아무거나 골라도 서버를 복원할 수 있다. -모든 Checkout은 모든 데이터를 가진 진정한 백업이다. +모든 Clone이 모든 데이터를 가진 진정한 백업이다. ////////////////////////// .Distributed version control. diff --git a/book/01-introduction/sections/installing.asc b/book/01-introduction/sections/installing.asc index cd2ee8cb..437d31cf 100644 --- a/book/01-introduction/sections/installing.asc +++ b/book/01-introduction/sections/installing.asc @@ -129,10 +129,10 @@ The binary installers tend to be a bit behind, though as Git has matured in rece ////////////////////////// If you do want to install Git from source, you need to have the following libraries that Git depends on: curl, zlib, openssl, expat, and libiconv. -For example, if you're on a system that has yum (such as Fedora) or apt-get (such as a Debian based system), you can use one of these commands to install all of the dependencies: +For example, if you're on a system that has yum (such as Fedora) or apt-get (such as a Debian based system), you can use one of these commands to install the minimal dependencies for compiling and installing the Git binaries: ////////////////////////// Git을 설치하려면 아래와 같은 라이브러리들이 필요하다. Git은 curl, zlib, openssl, expat, libiconv를 필요로 한다. -예를 들어 Fedora처럼 yum을 사용하는 시스템이나 apt-get이 있는 데비안류 시스템이면 아래 명령어를 실행하여 의존 패키지를 설치할 수 있다. +예를 들어 Fedora처럼 yum을 사용하는 시스템이나 apt-get이 있는 데비안류 시스템이면 명령어를 아래와 같이 실행해서 Git을 컴파일하고 설치하는데 꼭 필요한 의존 패키지를 설치할 수 있다. $ yum install curl-devel expat-devel gettext-devel \ openssl-devel zlib-devel @@ -140,6 +140,15 @@ Git을 설치하려면 아래와 같은 라이브러리들이 필요하다. Git $ apt-get install libcurl4-gnutls-dev libexpat1-dev gettext \ libz-dev libssl-dev +////////////////////////// +In order to be able to add the documentation in various formats (doc, html, info), these additional dependencies are required: +////////////////////////// +문서를 다양한 포멧(doc, html, info)으로 빌드하려면 아래와 같은 패키지도 필요하다. + + $ yum install asciidoc xmlto docbook2x + + $ apt-get install asciidoc xmlto docbook2x + ////////////////////////// When you have all the necessary dependencies, you can go ahead and grab the latest tagged release tarball from several places. You can get it via the Kernel.org site, at https://www.kernel.org/pub/software/scm/git[], or the mirror on the GitHub web site, at https://github.com/git/git/releases[]. @@ -154,8 +163,8 @@ Then, compile and install: ////////////////////////// 그리고 컴파일하고 설치한다. - $ tar -zxf git-1.9.1.tar.gz - $ cd git-1.9.1 + $ tar -zxf git-2.0.0.tar.gz + $ cd git-2.0.0 $ make configure $ ./configure --prefix=/usr $ make all doc info diff --git a/book/02-git-basics/images/lifecycle.png b/book/02-git-basics/images/lifecycle.png index a2b5979b..1ef9e684 100644 Binary files a/book/02-git-basics/images/lifecycle.png and b/book/02-git-basics/images/lifecycle.png differ diff --git a/book/02-git-basics/sections/recording-changes.asc b/book/02-git-basics/sections/recording-changes.asc index 66354cd3..c4e5ad0a 100644 --- a/book/02-git-basics/sections/recording-changes.asc +++ b/book/02-git-basics/sections/recording-changes.asc @@ -151,10 +151,10 @@ The `git add` command takes a path name for either a file or a directory; if it' ////////////////////////// Let's change a file that was already tracked. -If you change a previously tracked file called ``benchmarks.rb'' and then run your `git status` command again, you get something that looks like this: +If you change a previously tracked file called ``CONTRIBUTING.md'' and then run your `git status` command again, you get something that looks like this: ////////////////////////// 이미 Tracked 상태인 파일을 수정하는 법을 알아보자. -``benchmarks.rb'' 라는 파일을 수정하고 나서 `git status` 명령을 다시 실행하면 결과는 아래와 같다. +``CONTRIBUTING.md'' 라는 파일을 수정하고 나서 `git status` 명령을 다시 실행하면 결과는 아래와 같다. [source,console] ---- @@ -169,35 +169,35 @@ Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) - modified: benchmarks.rb + modified: CONTRIBUTING.md ---- ////////////////////////// -The ``benchmarks.rb'' file appears under a section named ``Changed but not staged for commit'' – which means that a file that is tracked has been modified in the working directory but not yet staged. +The ``CONTRIBUTING.md'' file appears under a section named ``Changed but not staged for commit'' – which means that a file that is tracked has been modified in the working directory but not yet staged. To stage it, you run the `git add` command. `git add` is a multipurpose command – you use it to begin tracking new files, to stage files, and to do other things like marking merge-conflicted files as resolved. It may be helpful to think of it more as ``add this content to the next commit'' rather than ``add this file to the project''.(((git commands, add))) -Let's run `git add` now to stage the ``benchmarks.rb'' file, and then run `git status` again: +Let's run `git add` now to stage the ``CONTRIBUTING.md'' file, and then run `git status` again: ////////////////////////// -이 ``benchmarks.rb'' 파일은 ``Changes not staged for commit''에 있다. 이것은 수정한 파일이 Tracked 상태이지만 아직 Staged 상태는 아니라는 것이다. +이 ``CONTRIBUTING.md'' 파일은 ``Changes not staged for commit''에 있다. 이것은 수정한 파일이 Tracked 상태이지만 아직 Staged 상태는 아니라는 것이다. Staged 상태로 만들려면 `git add` 명령을 실행해야 한다. `git add` 명령은 파일을 새로 추적할 때도 사용하고 수정한 파일을 Staged 상태로 만들 때도 사용한다. Merge할 때 충돌난 상태의 파일을 Resolve 상태로 만들때도 사용한다. add의 의미는 프로젝트에 파일을 추가한다기 보다는 다음 커밋에 추가한다고 받아들이는게 좋다.(((git commands, add))) -`git add` 명령을 실행하여 ``benchmarks.rb'' 파일을 Staged 상태로 만들고 `git status` 명령으로 결과를 확인해보자. +`git add` 명령을 실행하여 ``CONTRIBUTING.md'' 파일을 Staged 상태로 만들고 `git status` 명령으로 결과를 확인해보자. [source,console] ---- -$ git add benchmarks.rb +$ git add CONTRIBUTING.md $ git status On branch master Changes to be committed: (use "git reset HEAD ..." to unstage) new file: README - modified: benchmarks.rb + modified: CONTRIBUTING.md ---- ////////////////////////// Both files are staged and will go into your next commit. -At this point, suppose you remember one little change that you want to make in `benchmarks.rb` before you commit it. +At this point, suppose you remember one little change that you want to make in `CONTRIBUTING.md` before you commit it. You open it again and make that change, and you're ready to commit. However, let's run `git status` one more time: ////////////////////////// @@ -208,33 +208,33 @@ However, let's run `git status` one more time: [source,console] ---- -$ vim benchmarks.rb +$ vim CONTRIBUTING.md $ git status On branch master Changes to be committed: (use "git reset HEAD ..." to unstage) new file: README - modified: benchmarks.rb + modified: CONTRIBUTING.md Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) - modified: benchmarks.rb + modified: CONTRIBUTING.md ---- ////////////////////////// What the heck? -Now `benchmarks.rb` is listed as both staged _and_ unstaged. +Now `CONTRIBUTING.md` is listed as both staged _and_ unstaged. How is that possible? It turns out that Git stages a file exactly as it is when you run the `git add` command. -If you commit now, the version of `benchmarks.rb` as it was when you last ran the `git add` command is how it will go into the commit, not the version of the file as it looks in your working directory when you run `git commit`. +If you commit now, the version of `CONTRIBUTING.md` as it was when you last ran the `git add` command is how it will go into the commit, not the version of the file as it looks in your working directory when you run `git commit`. If you modify a file after you run `git add`, you have to run `git add` again to stage the latest version of the file: ////////////////////////// 헉! -`benchmarks.rb` 가 Staged 상태이면서 _동시에_ Unstaged 상태로 나온다. +`CONTRIBUTING.md` 가 Staged 상태이면서 _동시에_ Unstaged 상태로 나온다. 어떻게 이런 일이 가능할까? `git add` 명령을 실행하면 Git은 파일을 바로 Staged 상태로 만든다. 지금 이 시점에서 커밋을 하면 `git commit` 명령을 실행하는 시점의 버전이 커밋되는 것이 아니라 마지막으로 `git add` 명령을 실행했을 때의 버전이 커밋된다. @@ -242,14 +242,14 @@ If you modify a file after you run `git add`, you have to run `git add` again to [source,console] ---- -$ git add benchmarks.rb +$ git add CONTRIBUTING.md $ git status On branch master Changes to be committed: (use "git reset HEAD ..." to unstage) new file: README - modified: benchmarks.rb + modified: CONTRIBUTING.md ---- ////////////////////////// @@ -387,7 +387,7 @@ doc/**/*.txt [TIP] ////////////////////////// ==== -GitHub maintains a fairly comprehensive list of good `.gitignore` file examples for dozens or projects and languages at https://github.com/github/gitignore[] if you want a starting point for your project. +GitHub maintains a fairly comprehensive list of good `.gitignore` file examples for dozens of projects and languages at https://github.com/github/gitignore[] if you want a starting point for your project. ==== ////////////////////////// ==== @@ -412,10 +412,10 @@ Although `git status` answers those questions very generally by listing the file `git diff`는 나중에 더 자세히 다룬다. ////////////////////////// -Let's say you edit and stage the `README` file again and then edit the `benchmarks.rb` file without staging it. +Let's say you edit and stage the `README` file again and then edit the `CONTRIBUTING.md` file without staging it. If you run your `git status` command, you once again see something like this: ////////////////////////// -`README` 파일을 수정해서 Staged 상태로 만들고 `benchmarks.rb` 파일은 그냥 수정만 해둔다. +`README` 파일을 수정해서 Staged 상태로 만들고 `CONTRIBUTING.md` 파일은 그냥 수정만 해둔다. 이 상태에서 `git status` 명령을 실행하면 아래와 같은 메시지를 볼 수 있다. [source,console] @@ -431,7 +431,7 @@ Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) - modified: benchmarks.rb + modified: CONTRIBUTING.md ---- ////////////////////////// @@ -442,21 +442,20 @@ To see what you've changed but not yet staged, type `git diff` with no other arg [source,console] ---- $ git diff -diff --git a/benchmarks.rb b/benchmarks.rb -index 3cb747f..e445e28 100644 ---- a/benchmarks.rb -+++ b/benchmarks.rb -@@ -36,6 +36,10 @@ def main - @commit.parents[0].parents[0].parents[0] - end +diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md +index 8ebb991..643e24f 100644 +--- a/CONTRIBUTING.md ++++ b/CONTRIBUTING.md +@@ -65,7 +65,8 @@ branch directly, things can get messy. + Please include a nice description of your changes when you submit your PR; + if we have to read the whole diff to figure out why you're contributing + in the first place, you're less likely to get feedback and have your change +-merged in. ++merged in. Also, split your changes into comprehensive chunks if you patch is ++longer than a dozen lines. -+ run_code(x, 'commits 1') do -+ git.commits.size -+ end -+ - run_code(x, 'commits 2') do - log = git.commits('master', 15) - log.size + If you are starting to work on a particular area, feel free to submit a PR + that highlights your work in progress (and note in the PR title that it's ---- ////////////////////////// @@ -481,11 +480,8 @@ new file mode 100644 index 0000000..03902a1 --- /dev/null +++ b/README -@@ -0,0 +1,4 @@ +@@ -0,0 +1 @@ +My Project -+ -+ This is my project and it is amazing. -+ ---- ////////////////////////// @@ -496,27 +492,27 @@ This can be confusing, because if you've staged all of your changes, `git diff` 이 부분이 조금 헷갈릴 수 있다. 수정한 파일을 모두 Staging Area에 넣었다면 `git diff` 명령은 아무것도 출력하지 않는다. ////////////////////////// -For another example, if you stage the `benchmarks.rb` file and then edit it, you can use `git diff` to see the changes in the file that are staged and the changes that are unstaged. If our environment looks like this: +For another example, if you stage the `CONTRIBUTING.md` file and then edit it, you can use `git diff` to see the changes in the file that are staged and the changes that are unstaged. If our environment looks like this: ////////////////////////// -`benchmarks.rb` 파일을 Stage한 후에 다시 수정해도 `git diff` 명령을 사용할 수 있다. +`CONTRIBUTING.md` 파일을 Stage한 후에 다시 수정해도 `git diff` 명령을 사용할 수 있다. 이때는 Staged 상태인 것과 Unstaged 상태인 것을 비교한다. [source,console] ---- -$ git add benchmarks.rb -$ echo '# test line' >> benchmarks.rb +$ git add CONTRIBUTING.md +$ echo 'test line' >> CONTRIBUTING.md $ git status On branch master Changes to be committed: (use "git reset HEAD ..." to unstage) - modified: benchmarks.rb + modified: CONTRIBUTING.md Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) - modified: benchmarks.rb + modified: CONTRIBUTING.md ---- ////////////////////////// @@ -527,43 +523,41 @@ Now you can use `git diff` to see what is still unstaged [source,console] ---- $ git diff -diff --git a/benchmarks.rb b/benchmarks.rb -index e445e28..86b2f7c 100644 ---- a/benchmarks.rb -+++ b/benchmarks.rb -@@ -127,3 +127,4 @@ end - main() - - ##pp Grit::GitRuby.cache_client.stats +diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md +index 643e24f..87f08c8 100644 +--- a/CONTRIBUTING.md ++++ b/CONTRIBUTING.md +@@ -119,3 +119,4 @@ at the + ## Starter Projects + + See our [projects list](https://github.com/libgit2/libgit2/blob/development/PROJECTS.md). +# test line ---- ////////////////////////// -and `git diff --cached` to see what you've staged so far: +and `git diff --cached` to see what you've staged so far (--staged and --cached are synonyms): ////////////////////////// -Staged 상태인 파일은 `git diff --cached` 옵션으로 확인한다. +Staged 상태인 파일은 `git diff --cached` 옵션으로 확인한다(--staged은 --cached는 같은 옵션이다). [source,console] ---- $ git diff --cached -diff --git a/benchmarks.rb b/benchmarks.rb -index 3cb747f..e445e28 100644 ---- a/benchmarks.rb -+++ b/benchmarks.rb -@@ -36,6 +36,10 @@ def main - @commit.parents[0].parents[0].parents[0] - end - -+ run_code(x, 'commits 1') do -+ git.commits.size -+ end -+ - run_code(x, 'commits 2') do - log = git.commits('master', 15) - log.size ----- - -[[_git_difftool]] +diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md +index 8ebb991..643e24f 100644 +--- a/CONTRIBUTING.md ++++ b/CONTRIBUTING.md +@@ -65,7 +65,8 @@ branch directly, things can get messy. + Please include a nice description of your changes when you submit your PR; + if we have to read the whole diff to figure out why you're contributing + in the first place, you're less likely to get feedback and have your change +-merged in. ++merged in. Also, split your changes into comprehensive chunks if you patch is ++longer than a dozen lines. + + If you are starting to work on a particular area, feel free to submit a PR + that highlights your work in progress (and note in the PR title that it's +---- + [NOTE] ////////////////////////// .Git Diff in an External Tool @@ -620,7 +614,7 @@ The editor displays the following text (this example is a Vim screen): # On branch master # Changes to be committed: # new file: README -# modified: benchmarks.rb +# modified: CONTRIBUTING.md # ~ ~ @@ -693,7 +687,7 @@ Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) - modified: benchmarks.rb + modified: CONTRIBUTING.md no changes added to commit (use "git add" and/or "git commit -a") $ git commit -a -m 'added new benchmarks' @@ -702,9 +696,9 @@ $ git commit -a -m 'added new benchmarks' ---- ////////////////////////// -Notice how you don't have to run `git add` on the ``benchmarks.rb'' file in this case before you commit. +Notice how you don't have to run `git add` on the ``CONTRIBUTING.md'' file in this case before you commit. ////////////////////////// -이 예제에서는 커밋하기 전에 `git add` 명령으로 ``benchmarks.rb'' 파일을 추가하지 않았다는 점을 눈여겨보자. +이 예제에서는 커밋하기 전에 `git add` 명령으로 ``CONTRIBUTING.md'' 파일을 추가하지 않았다는 점을 눈여겨보자. [[_removing_files]] ////////////////////////// @@ -727,14 +721,14 @@ If you simply remove the file from your working directory, it shows up under the [source,console] ---- -$ rm grit.gemspec +$ rm PROJECTS.md $ git status On branch master Changes not staged for commit: (use "git add/rm ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) - deleted: grit.gemspec + deleted: PROJECTS.md no changes added to commit (use "git add" and/or "git commit -a") ---- @@ -746,14 +740,14 @@ Then, if you run `git rm`, it stages the file's removal: [source,console] ---- -$ git rm grit.gemspec -rm 'grit.gemspec' +$ git rm PROJECTS.md +rm 'PROJECTS.md' $ git status On branch master Changes to be committed: (use "git reset HEAD ..." to unstage) - deleted: grit.gemspec + deleted: PROJECTS.md ---- ////////////////////////// diff --git a/book/02-git-basics/sections/remotes.asc b/book/02-git-basics/sections/remotes.asc index 17b19eda..54f0c895 100644 --- a/book/02-git-basics/sections/remotes.asc +++ b/book/02-git-basics/sections/remotes.asc @@ -98,8 +98,8 @@ Notice that these remotes use a variety of protocols; we'll cover more about thi ==== 리모트 저장소 추가하기 ////////////////////////// -이전 절에서도 리모트 저장소를 추가하는 것에 대해 설명했었지만 수박 겉핥기식으로 살펴봤을 뿐이었다. 여기에서는 리모트 저장소를 추가하는 방법을 자세하게 설명한다.(((git commands, remote))) -새 리모트 저장소를 쉽게 추가할 수 있는데 `git remote add [단축이름] [url]` 명령을 실행한다. +We've mentioned and given some demonstrations of adding remote repositories in previous sections, but here is how to do it explicitly.(((git commands, remote))) +To add a new remote Git repository as a shortname you can reference easily, run `git remote add [shortname] [url]`: ////////////////////////// 이전 절에서도 리모트 저장소를 추가하는 것에 대해 설명했었지만 수박 겉핥기식으로 살펴봤을 뿐이었다. 여기에서는 리모트 저장소를 추가하는 방법을 자세하게 설명한다.(((git commands, remote))) 새 리모트 저장소를 쉽게 추가할 수 있는데 `git remote add [단축이름] [url]` 명령을 실행한다. diff --git a/book/02-git-basics/sections/tagging.asc b/book/02-git-basics/sections/tagging.asc index b9f75b39..4b7bdf49 100644 --- a/book/02-git-basics/sections/tagging.asc +++ b/book/02-git-basics/sections/tagging.asc @@ -312,10 +312,10 @@ Now, when someone else clones or pulls from your repository, they will get all y ////////////////////////// You can't really check out a tag in Git, since they can't be moved around. -If you want to put a version of your repository in your working directory that looks like a specific tag, you can create a new branch at a specific tag: +If you want to put a version of your repository in your working directory that looks like a specific tag, you can create a new branch at a specific tag with `git checkout -b [branchname] [tagname]`: ////////////////////////// 태그는 브랜치와는 달리 가리키는 커밋을 바꿀 수 없는 이름이기 때문에 Checkout해서 사용할 수 없다. -태그가 가리키는 특정 커밋 기반의 브랜치를 만들어 작업하려면 다음과 같이 새로 브랜치를 생성한다. +태그가 가리키는 특정 커밋 기반의 브랜치는 `git checkout -b [branchname] [tagname]` 명령으로 만든다. 아래는 그 예제이다. [source,console] ---- diff --git a/book/02-git-basics/sections/undoing.asc b/book/02-git-basics/sections/undoing.asc index fa88b4db..d06088c9 100644 --- a/book/02-git-basics/sections/undoing.asc +++ b/book/02-git-basics/sections/undoing.asc @@ -86,21 +86,21 @@ Changes to be committed: (use "git reset HEAD ..." to unstage) renamed: README.md -> README - modified: benchmarks.rb + modified: CONTRIBUTING.md ---- ////////////////////////// Right below the ``Changes to be committed'' text, it says use `git reset HEAD ...` to unstage. -So, let's use that advice to unstage the `benchmarks.rb` file: +So, let's use that advice to unstage the `CONTRIBUTING.md` file: ////////////////////////// `Changes to be commited` 밑에 `git reset HEAD ...` 메시지를 볼 수 있다. -이 명령으로 Unstage 상태로 변경할 수 있다. benchmarks.rb 파일을 Unstage 상태로 변경해보자: +이 명령으로 Unstage 상태로 변경할 수 있다. `CONTRIBUTING.md` 파일을 Unstage 상태로 변경해보자: [source,console] ---- -$ git reset HEAD benchmarks.rb +$ git reset HEAD CONTRIBUTING.md Unstaged changes after reset: -M benchmarks.rb +M CONTRIBUTING.md $ git status On branch master Changes to be committed: @@ -112,15 +112,15 @@ Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) - modified: benchmarks.rb + modified: CONTRIBUTING.md ---- ////////////////////////// The command is a bit strange, but it works. -The `benchmarks.rb` file is modified but once again unstaged. +The `CONTRIBUTING.md` file is modified but once again unstaged. ////////////////////////// 명령어가 낮설게 느껴질 수도 있지만 잘 동작한다. -`benchmarks.rb` 파일은 Unstage 상태가 됐다. +`CONTRIBUTING.md` 파일은 Unstage 상태가 됐다. [NOTE] ////////////////////////// @@ -143,12 +143,12 @@ For now this magic invocation is all you need to know about the `git reset` comm ==== Modified 파일 되돌리기 ////////////////////////// -What if you realize that you don't want to keep your changes to the `benchmarks.rb` file? +What if you realize that you don't want to keep your changes to the `CONTRIBUTING.md` file? How can you easily unmodify it – revert it back to what it looked like when you last committed (or initially cloned, or however you got it into your working directory)? Luckily, `git status` tells you how to do that, too. In the last example output, the unstaged area looks like this: ////////////////////////// -어떻게 해야 benchmarks.rb 파일을 수정하고 나서 다시 되돌릴 수 있을까? +어떻게 해야 `CONTRIBUTING.md` 파일을 수정하고 나서 다시 되돌릴 수 있을까? 그러니까 최근 커밋된 버전으로(아니면 처음 Clone했을 때처럼 워킹 디렉토리에 처음 Checkout 한 그 내용으로) 되돌리는 방법이 무얼까? `git status` 명령이 친절하게 알려준다. 바로 위에 있는 예제에서 Unstaged 부분을 보자. @@ -159,7 +159,7 @@ Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) - modified: benchmarks.rb + modified: CONTRIBUTING.md ---- ////////////////////////// @@ -171,7 +171,7 @@ Let's do what it says: [source,console] ---- -$ git checkout -- benchmarks.rb +$ git checkout -- CONTRIBUTING.md $ git status On branch master Changes to be committed: diff --git a/book/02-git-basics/sections/viewing-history.asc b/book/02-git-basics/sections/viewing-history.asc index c550abf8..c2999d9b 100644 --- a/book/02-git-basics/sections/viewing-history.asc +++ b/book/02-git-basics/sections/viewing-history.asc @@ -222,7 +222,7 @@ a11bef0 - Scott Chacon, 6 years ago : first commit | `%p` | Abbreviated parent hashes | `%an` | Author name | `%ae` | Author e-mail -| `%ad` | Author date (format respects the –date= option) +| `%ad` | Author date (format respects the --date= option) | `%ar` | Author date, relative | `%cn` | Committer name | `%ce` | Committer email @@ -378,7 +378,7 @@ Another really helpful filter is the `-S` option which takes a string and only s [source,console] ---- -$ git log --Sfunction_name +$ git log -Sfunction_name ---- ////////////////////////// diff --git a/book/03-git-branching/images/advance-master.png b/book/03-git-branching/images/advance-master.png index 196dcd57..b789feda 100644 Binary files a/book/03-git-branching/images/advance-master.png and b/book/03-git-branching/images/advance-master.png differ diff --git a/book/03-git-branching/images/advance-testing.png b/book/03-git-branching/images/advance-testing.png index f4b585d2..35d05811 100644 Binary files a/book/03-git-branching/images/advance-testing.png and b/book/03-git-branching/images/advance-testing.png differ diff --git a/book/03-git-branching/images/basic-branching-1.png b/book/03-git-branching/images/basic-branching-1.png index 9e059fbc..b49b9f4c 100644 Binary files a/book/03-git-branching/images/basic-branching-1.png and b/book/03-git-branching/images/basic-branching-1.png differ diff --git a/book/03-git-branching/images/basic-branching-2.png b/book/03-git-branching/images/basic-branching-2.png index 2be5a17c..329c9f52 100644 Binary files a/book/03-git-branching/images/basic-branching-2.png and b/book/03-git-branching/images/basic-branching-2.png differ diff --git a/book/03-git-branching/images/basic-branching-3.png b/book/03-git-branching/images/basic-branching-3.png index d048775b..688addac 100644 Binary files a/book/03-git-branching/images/basic-branching-3.png and b/book/03-git-branching/images/basic-branching-3.png differ diff --git a/book/03-git-branching/images/basic-branching-4.png b/book/03-git-branching/images/basic-branching-4.png index 62f4d109..c1f1f477 100644 Binary files a/book/03-git-branching/images/basic-branching-4.png and b/book/03-git-branching/images/basic-branching-4.png differ diff --git a/book/03-git-branching/images/basic-branching-5.png b/book/03-git-branching/images/basic-branching-5.png index 1d9a58de..1d4c0642 100644 Binary files a/book/03-git-branching/images/basic-branching-5.png and b/book/03-git-branching/images/basic-branching-5.png differ diff --git a/book/03-git-branching/images/basic-branching-6.png b/book/03-git-branching/images/basic-branching-6.png index bd4d996c..b93918b5 100644 Binary files a/book/03-git-branching/images/basic-branching-6.png and b/book/03-git-branching/images/basic-branching-6.png differ diff --git a/book/03-git-branching/images/basic-merging-1.png b/book/03-git-branching/images/basic-merging-1.png index d9b85dfa..08b923f3 100644 Binary files a/book/03-git-branching/images/basic-merging-1.png and b/book/03-git-branching/images/basic-merging-1.png differ diff --git a/book/03-git-branching/images/basic-merging-2.png b/book/03-git-branching/images/basic-merging-2.png index e8ceae3d..b1c58b23 100644 Binary files a/book/03-git-branching/images/basic-merging-2.png and b/book/03-git-branching/images/basic-merging-2.png differ diff --git a/book/03-git-branching/images/basic-rebase-1.png b/book/03-git-branching/images/basic-rebase-1.png index 87fae42c..bc804f6a 100644 Binary files a/book/03-git-branching/images/basic-rebase-1.png and b/book/03-git-branching/images/basic-rebase-1.png differ diff --git a/book/03-git-branching/images/basic-rebase-2.png b/book/03-git-branching/images/basic-rebase-2.png index 627fbd54..c75bf386 100644 Binary files a/book/03-git-branching/images/basic-rebase-2.png and b/book/03-git-branching/images/basic-rebase-2.png differ diff --git a/book/03-git-branching/images/basic-rebase-3.png b/book/03-git-branching/images/basic-rebase-3.png index b40d8cb9..a18e34f9 100644 Binary files a/book/03-git-branching/images/basic-rebase-3.png and b/book/03-git-branching/images/basic-rebase-3.png differ diff --git a/book/03-git-branching/images/basic-rebase-4.png b/book/03-git-branching/images/basic-rebase-4.png index 767be386..277b9257 100644 Binary files a/book/03-git-branching/images/basic-rebase-4.png and b/book/03-git-branching/images/basic-rebase-4.png differ diff --git a/book/03-git-branching/images/branch-and-history.png b/book/03-git-branching/images/branch-and-history.png index e32ad212..ba2734e0 100644 Binary files a/book/03-git-branching/images/branch-and-history.png and b/book/03-git-branching/images/branch-and-history.png differ diff --git a/book/03-git-branching/images/checkout-master.png b/book/03-git-branching/images/checkout-master.png index 8a24244e..db052e6a 100644 Binary files a/book/03-git-branching/images/checkout-master.png and b/book/03-git-branching/images/checkout-master.png differ diff --git a/book/03-git-branching/images/commit-and-tree.png b/book/03-git-branching/images/commit-and-tree.png index 7d4699cc..65289ae8 100644 Binary files a/book/03-git-branching/images/commit-and-tree.png and b/book/03-git-branching/images/commit-and-tree.png differ diff --git a/book/03-git-branching/images/commits-and-parents.png b/book/03-git-branching/images/commits-and-parents.png index f76f824a..e0c9bbea 100644 Binary files a/book/03-git-branching/images/commits-and-parents.png and b/book/03-git-branching/images/commits-and-parents.png differ diff --git a/book/03-git-branching/images/head-to-master.png b/book/03-git-branching/images/head-to-master.png index f7ab635e..5086d0fb 100644 Binary files a/book/03-git-branching/images/head-to-master.png and b/book/03-git-branching/images/head-to-master.png differ diff --git a/book/03-git-branching/images/head-to-testing.png b/book/03-git-branching/images/head-to-testing.png index 5c8d13b7..5422a8ed 100644 Binary files a/book/03-git-branching/images/head-to-testing.png and b/book/03-git-branching/images/head-to-testing.png differ diff --git a/book/03-git-branching/images/interesting-rebase-1.png b/book/03-git-branching/images/interesting-rebase-1.png index f07c05a6..410287e6 100644 Binary files a/book/03-git-branching/images/interesting-rebase-1.png and b/book/03-git-branching/images/interesting-rebase-1.png differ diff --git a/book/03-git-branching/images/interesting-rebase-2.png b/book/03-git-branching/images/interesting-rebase-2.png index 51f8589a..ac274080 100644 Binary files a/book/03-git-branching/images/interesting-rebase-2.png and b/book/03-git-branching/images/interesting-rebase-2.png differ diff --git a/book/03-git-branching/images/interesting-rebase-3.png b/book/03-git-branching/images/interesting-rebase-3.png index 19613beb..91f46473 100644 Binary files a/book/03-git-branching/images/interesting-rebase-3.png and b/book/03-git-branching/images/interesting-rebase-3.png differ diff --git a/book/03-git-branching/images/interesting-rebase-4.png b/book/03-git-branching/images/interesting-rebase-4.png index 1ede739a..89af34f5 100644 Binary files a/book/03-git-branching/images/interesting-rebase-4.png and b/book/03-git-branching/images/interesting-rebase-4.png differ diff --git a/book/03-git-branching/images/interesting-rebase-5.png b/book/03-git-branching/images/interesting-rebase-5.png index 866315fe..0bc02243 100644 Binary files a/book/03-git-branching/images/interesting-rebase-5.png and b/book/03-git-branching/images/interesting-rebase-5.png differ diff --git a/book/03-git-branching/images/lr-branches-1.png b/book/03-git-branching/images/lr-branches-1.png index f85ab7d5..3d26562f 100644 Binary files a/book/03-git-branching/images/lr-branches-1.png and b/book/03-git-branching/images/lr-branches-1.png differ diff --git a/book/03-git-branching/images/lr-branches-2.png b/book/03-git-branching/images/lr-branches-2.png index 8cf89365..acfb23db 100644 Binary files a/book/03-git-branching/images/lr-branches-2.png and b/book/03-git-branching/images/lr-branches-2.png differ diff --git a/book/03-git-branching/images/perils-of-rebasing-1.png b/book/03-git-branching/images/perils-of-rebasing-1.png index 7d188fba..ce92ce97 100644 Binary files a/book/03-git-branching/images/perils-of-rebasing-1.png and b/book/03-git-branching/images/perils-of-rebasing-1.png differ diff --git a/book/03-git-branching/images/perils-of-rebasing-2.png b/book/03-git-branching/images/perils-of-rebasing-2.png index 7ed5537e..e9b643fa 100644 Binary files a/book/03-git-branching/images/perils-of-rebasing-2.png and b/book/03-git-branching/images/perils-of-rebasing-2.png differ diff --git a/book/03-git-branching/images/perils-of-rebasing-3.png b/book/03-git-branching/images/perils-of-rebasing-3.png index fbda0189..e049cbcd 100644 Binary files a/book/03-git-branching/images/perils-of-rebasing-3.png and b/book/03-git-branching/images/perils-of-rebasing-3.png differ diff --git a/book/03-git-branching/images/perils-of-rebasing-4.png b/book/03-git-branching/images/perils-of-rebasing-4.png index a75635d2..669fc812 100644 Binary files a/book/03-git-branching/images/perils-of-rebasing-4.png and b/book/03-git-branching/images/perils-of-rebasing-4.png differ diff --git a/book/03-git-branching/images/perils-of-rebasing-5.png b/book/03-git-branching/images/perils-of-rebasing-5.png index 6ca03008..9ba97480 100644 Binary files a/book/03-git-branching/images/perils-of-rebasing-5.png and b/book/03-git-branching/images/perils-of-rebasing-5.png differ diff --git a/book/03-git-branching/images/remote-branches-1.png b/book/03-git-branching/images/remote-branches-1.png index f964f32d..394234f0 100644 Binary files a/book/03-git-branching/images/remote-branches-1.png and b/book/03-git-branching/images/remote-branches-1.png differ diff --git a/book/03-git-branching/images/remote-branches-2.png b/book/03-git-branching/images/remote-branches-2.png index 4ec0c670..cd9e9d27 100644 Binary files a/book/03-git-branching/images/remote-branches-2.png and b/book/03-git-branching/images/remote-branches-2.png differ diff --git a/book/03-git-branching/images/remote-branches-3.png b/book/03-git-branching/images/remote-branches-3.png index bfa494d7..f2a2d163 100644 Binary files a/book/03-git-branching/images/remote-branches-3.png and b/book/03-git-branching/images/remote-branches-3.png differ diff --git a/book/03-git-branching/images/remote-branches-4.png b/book/03-git-branching/images/remote-branches-4.png index 983ad89b..9047854e 100644 Binary files a/book/03-git-branching/images/remote-branches-4.png and b/book/03-git-branching/images/remote-branches-4.png differ diff --git a/book/03-git-branching/images/remote-branches-5.png b/book/03-git-branching/images/remote-branches-5.png index f5f703e1..78b10d28 100644 Binary files a/book/03-git-branching/images/remote-branches-5.png and b/book/03-git-branching/images/remote-branches-5.png differ diff --git a/book/03-git-branching/images/topic-branches-1.png b/book/03-git-branching/images/topic-branches-1.png index d0d2c094..5463092b 100644 Binary files a/book/03-git-branching/images/topic-branches-1.png and b/book/03-git-branching/images/topic-branches-1.png differ diff --git a/book/03-git-branching/images/topic-branches-2.png b/book/03-git-branching/images/topic-branches-2.png index ec305393..320e4e88 100644 Binary files a/book/03-git-branching/images/topic-branches-2.png and b/book/03-git-branching/images/topic-branches-2.png differ diff --git a/book/03-git-branching/images/two-branches.png b/book/03-git-branching/images/two-branches.png index f4f94a67..01b385c3 100644 Binary files a/book/03-git-branching/images/two-branches.png and b/book/03-git-branching/images/two-branches.png differ diff --git a/book/03-git-branching/sections/basic-branching-and-merging.asc b/book/03-git-branching/sections/basic-branching-and-merging.asc index f0848f86..22c14008 100644 --- a/book/03-git-branching/sections/basic-branching-and-merging.asc +++ b/book/03-git-branching/sections/basic-branching-and-merging.asc @@ -270,7 +270,7 @@ $ git checkout master Switched to branch 'master' $ git merge iss53 Merge made by the 'recursive' strategy. -README | 1 + +index.html | 1 + 1 file changed, 1 insertion(+) ---- diff --git a/book/03-git-branching/sections/rebasing.asc b/book/03-git-branching/sections/rebasing.asc index 4a589e39..83a245ab 100644 --- a/book/03-git-branching/sections/rebasing.asc +++ b/book/03-git-branching/sections/rebasing.asc @@ -71,8 +71,8 @@ It works by going to the common ancestor of the two branches (the one you're on 실제로 일어나는 일을 설명하자면 일단 두 브랜치가 나뉘기 전인 공통 커밋으로 이동하고 나서 그 커밋부터 지금 Checkout한 브랜치가 가리키는 커밋까지 diff를 차례로 만들어 어딘가에 임시로 저장해 놓는다. Rebase할 브랜치(역주 - experiment)가 합칠 브랜치(역주 - master)가 가리키는 커밋을 가리키게 하고 아까 저장해 놓았던 변경사항을 차례대로 적용한다. ////////////////////////// -.Rebasing the change introduced in `C3` onto `C4` -image::images/basic-rebase-3.png[Rebasing the change introduced in `C3` onto `C4`.] +.Rebasing the change introduced in `C4` onto `C3` +image::images/basic-rebase-3.png[Rebasing the change introduced in `C4` onto `C3`.] ////////////////////////// .`C4`의 변경사항을 `C3`에 적용하는 Rebase 과정 image::images/basic-rebase-3.png[`C4`의 변경사항을 `C3`에 적용하는 Rebase 과정] @@ -288,10 +288,10 @@ Your commit history looks like this: ////////////////////////// .Clone a repository, and base some work on it -image::images/perils-of-rebasing-1.png[Clone a repository, and base some work on it.] +image::images/perils-of-rebasing-1.png["Clone a repository, and base some work on it."] ////////////////////////// .저장소를 Clone하고 일부 수정함 -image::images/perils-of-rebasing-1.png[저장소를 Clone하고 일부 수정함] +image::images/perils-of-rebasing-1.png["저장소를 Clone하고 일부 수정함"] ////////////////////////// Now, someone else does more work that includes a merge, and pushes that work to the central server. @@ -302,10 +302,10 @@ You fetch them and merge the new remote branch into your work, making your histo ////////////////////////// .Fetch more commits, and merge them into your work -image::images/perils-of-rebasing-2.png[Fetch more commits, and merge them into your work.] +image::images/perils-of-rebasing-2.png["Fetch more commits, and merge them into your work."] ////////////////////////// .Fetch한 후 Merge함 -image::images/perils-of-rebasing-2.png[Fetch한 후 Merge함] +image::images/perils-of-rebasing-2.png["Fetch한 후 Merge함"] ////////////////////////// Next, the person who pushed the merged work decides to go back and rebase their work instead; they do a `git push --force` to overwrite the history on the server. @@ -317,10 +317,10 @@ You then fetch from that server, bringing down the new commits. [[_pre_merge_rebase_work]] ////////////////////////// .Someone pushes rebased commits, abandoning commits you've based your work on -image::images/perils-of-rebasing-3.png[Someone pushes rebased commits, abandoning commits you've based your work on.] +image::images/perils-of-rebasing-3.png["Someone pushes rebased commits, abandoning commits you've based your work on."] ////////////////////////// .한 팀원이 다른 팀원이 의존하는 커밋을 없애고 Rebase한 커밋을 다시 Push함 -image::images/perils-of-rebasing-3.png[한 팀원이 다른 팀원이 의존하는 커밋을 없애고 Rebase한 커밋을 다시 Push함] +image::images/perils-of-rebasing-3.png["한 팀원이 다른 팀원이 의존하는 커밋을 없애고 Rebase한 커밋을 다시 Push함"] ////////////////////////// Now you're both in a pickle. @@ -358,9 +358,9 @@ If you *do* find yourself in a situation like this, Git has some further magic t 만약 이런 상황에 빠질 때에 유용한 Git 기능이 하나 있다. 어떤 팀원이 강제로 내가 한일을 덮어썼다고 하자. 그러면 내가 했던 일이 무엇이고 덮어쓴 내용이 무엇인지 알아내야 한다. ////////////////////////// -It turns out that in addition to the commit SHA checksum, Git also calculate a checksum that is based just on the patch introduced with the commit. This is called a ``patch-id''. +It turns out that in addition to the commit SHA-1 checksum, Git also calculate a checksum that is based just on the patch introduced with the commit. This is called a ``patch-id''. ////////////////////////// -커밋 SHA 체크섬 외에도 Git은 커밋에 패치할 내용으로 SHA 체크섬을 한번 더 구한다. 이 값은 ``patch-id''라고 한다. +커밋 SHA 체크섬 외에도 Git은 커밋에 패치할 내용으로 SHA-1 체크섬을 한번 더 구한다. 이 값은 ``patch-id''라고 한다. ////////////////////////// If you pull down work that was rewritten and rebase it on top of the new commits from your partner, Git can often successfully figure out what is uniquely yours and apply them back on top of the new branch. diff --git a/book/03-git-branching/sections/remote-branches.asc b/book/03-git-branching/sections/remote-branches.asc index 6d5a7a98..fd139dbb 100644 --- a/book/03-git-branching/sections/remote-branches.asc +++ b/book/03-git-branching/sections/remote-branches.asc @@ -169,7 +169,7 @@ Git은 serverfix라는 브랜치 이름을 `refs/heads/serverfix:refs/heads/serv ==== If you're using an HTTPS URL to push over, the Git server will ask you for your username and password for authentication. By default it will prompt you on the terminal for this information so the server can tell if you're allowed to push. -If you don't want to type it every sinlge time you push, you can set up a ``credential cache''. The simplest is just to keep it in memory for a few mintues, which you can easily set up by running `git config --global credential.helper cache`. +If you don't want to type it every single time you push, you can set up a ``credential cache''. The simplest is just to keep it in memory for a few mintues, which you can easily set up by running `git config --global credential.helper cache`. For more information on the various credential caching options available, see <<_credential_caching>>. ==== @@ -178,7 +178,7 @@ For more information on the various credential caching options available, see << ==== HTTPS URL로 시작하는 리모트 저장소를 사용한다면 아마도 Push나 Pull을 할 때 인증을 위한 ID나 Password를 묻는 것을 볼 수 있다. 보통 터미널에서 작업하는 경우 Git이 이 정보를 사용자로부터 받기 위해 ID나 Password를 입력받아 서버로 전달해서 권한을 확인한다. -이 리모트에 접근할 때마다 매번 ID나 Password를 입력하지 않도록 ``crediential cache'' 기능을 이용할 수 있다. 이 기능을 활성화하면 Git은 몇 분 동안 입력한 ID나 Password를 저장해둔다. 이 기능을 활성화하려면 `git config --global credential.helper cache` 명령을 실행하여 환경설정을 추가한다. +Push할 때마다 매번 ID나 Password를 입력하지 않도록 ``crediential cache'' 기능을 이용할 수 있다. 이 기능을 활성화하면 Git은 몇 분 동안 입력한 ID나 Password를 저장해둔다. 이 기능을 활성화하려면 `git config --global credential.helper cache` 명령을 실행하여 환경설정을 추가한다. 이 기능이 제공하는 다른 옵션에 대한 자세한 설명은 <<_credential_caching>>를 참고한다. ==== @@ -291,7 +291,7 @@ Branch serverfix set up to track remote branch serverfix from origin. ////////////////////////// .Upstream shorthand ==== -When you have an tracking branch set up, you can reference it with the `@{upstream}` or `@{u}` shorthand. So if you're on the `master` branch and it's tracking `origin/master`, you can say something like `git merge @{u}` instead of `git merge origin/master` if you wish.(((+++@{u}+++)))(((+++@{upstream}+++))) +When you have a tracking branch set up, you can reference it with the `@{upstream}` or `@{u}` shorthand. So if you're on the `master` branch and it's tracking `origin/master`, you can say something like `git merge @{u}` instead of `git merge origin/master` if you wish.(((+++@{u}+++)))(((+++@{upstream}+++))) ==== ////////////////////////// .업스트림 별명 diff --git a/book/04-git-server/images/bitnami.png b/book/04-git-server/images/bitnami.png index c3fe9bf9..b7929f48 100644 Binary files a/book/04-git-server/images/bitnami.png and b/book/04-git-server/images/bitnami.png differ diff --git a/book/04-git-server/images/git-instaweb.png b/book/04-git-server/images/git-instaweb.png index 6d3937e2..6c56b710 100644 Binary files a/book/04-git-server/images/git-instaweb.png and b/book/04-git-server/images/git-instaweb.png differ diff --git a/book/04-git-server/images/gitlab-broadcast.png b/book/04-git-server/images/gitlab-broadcast.png index af3c0a40..5658f4e0 100644 Binary files a/book/04-git-server/images/gitlab-broadcast.png and b/book/04-git-server/images/gitlab-broadcast.png differ diff --git a/book/04-git-server/images/gitlab-groups.png b/book/04-git-server/images/gitlab-groups.png index 71da5f61..486b4441 100644 Binary files a/book/04-git-server/images/gitlab-groups.png and b/book/04-git-server/images/gitlab-groups.png differ diff --git a/book/04-git-server/images/gitlab-menu.png b/book/04-git-server/images/gitlab-menu.png index b0e6a2c2..902a7f96 100644 Binary files a/book/04-git-server/images/gitlab-menu.png and b/book/04-git-server/images/gitlab-menu.png differ diff --git a/book/04-git-server/images/gitlab-users.png b/book/04-git-server/images/gitlab-users.png index ea8cf980..4e2b2090 100644 Binary files a/book/04-git-server/images/gitlab-users.png and b/book/04-git-server/images/gitlab-users.png differ diff --git a/book/04-git-server/sections/git-daemon.asc b/book/04-git-server/sections/git-daemon.asc index 58bfda9a..2adf7b7a 100644 --- a/book/04-git-server/sections/git-daemon.asc +++ b/book/04-git-server/sections/git-daemon.asc @@ -68,7 +68,7 @@ respawn ////////////////////////// For security reasons, it is strongly encouraged to have this daemon run as a user with read-only permissions to the repositories – you can easily do this by creating a new user 'git-ro' and running the daemon as them. -For the sake of simplicity we'll simply run it as the same 'git' user that Gitosis is running as. +For the sake of simplicity we'll simply run it as the same 'git' user that `git-shell` is running as. ////////////////////////// 보안을 위해서 저장소를 읽을 수만 있는 사용자로 데몬을 실행시킬 것을 강력하게 권고한다. `git-ro`라는 계정을 새로 만들고 그 계정으로 데몬을 실행시키는 것이 좋다. 하지만 여기에서는 쉽게 설명하려고 그냥 `git` 계정을 사용한다. diff --git a/book/04-git-server/sections/git-on-a-server.asc b/book/04-git-server/sections/git-on-a-server.asc index 663c53c3..ef72a40b 100644 --- a/book/04-git-server/sections/git-on-a-server.asc +++ b/book/04-git-server/sections/git-on-a-server.asc @@ -124,7 +124,7 @@ You're ready to go – nothing else needed. ////////////////////////// In the next few sections, you'll see how to expand to more sophisticated setups. -This discussion will include not having to create user accounts for each user, adding public read access to repositories, setting up web UIs, using the Gitosis tool, and more. +This discussion will include not having to create user accounts for each user, adding public read access to repositories, setting up web UIs and more. However, keep in mind that to collaborate with a couple of people on a private project, all you _need_ is an SSH server and a bare repository. ////////////////////////// 다음 절에서는 좀 더 정교하게 설정하는 법을 살펴볼 것이다. diff --git a/book/04-git-server/sections/gitlab.asc b/book/04-git-server/sections/gitlab.asc index 6aa8707a..9fda2c8a 100644 --- a/book/04-git-server/sections/gitlab.asc +++ b/book/04-git-server/sections/gitlab.asc @@ -8,7 +8,7 @@ GitWeb is pretty simplistic though. If you're looking for a more modern, fully featured Git server, there are some several open source solutions out there that you can install instead. As GitLab is one of the more popular ones, we'll cover installing and using it as an example. -This is a bit more complex than the GitWeb option and likely requires more maintainance, but it is a much more fully featured option. +This is a bit more complex than the GitWeb option and likely requires more maintenance, but it is a much more fully featured option. ////////////////////////// 간단하게 쓰기엔 GitWeb이 꽤 좋다. 근데 좀 더 기능이 많은 Git 서버를 쓰려면 다른 서버를 찾아 설치해야 한다. @@ -272,10 +272,10 @@ Merge 요청과 이슈는 대화의 기본 단위이다. 요청과 이슈는 모두 사용자에게 할당되거나 마일스톤의 과제로 편입된다. ////////////////////////// -This section has focused mainly on the Git-related parts of GitLab, but it's a fairly mature system, and provides many other features that can help your team work together. +This section is focused mainly on the Git-related features of GitLab, but as a mature project, it provides many other features to help your team work together, such as project wikis and system maintenance tools. These include project wikis, discussion ``walls'', and system maintenance tools. One benefit to GitLab is that, once the server is set up and running, you'll rarely need to tweak a configuration file or access the server via SSH; most administration and general usage can be accomplished through the in-browser interface. ////////////////////////// 이 섹션에서는 GitLab의 Git과 맞닿은 부분만 설명했지만 이게 전부가 아니다. GitLab은 굉장히 성숙했다. -이 외에도 프로젝트 위키나 토론용 ``walls'', 시스템 관리 도구 등등 협업용 기능이 많다. +GitLab에는 프로젝트 위키나 토론용 ``walls'', 시스템 관리 도구 등등 협업용 기능이 많다. GitLab의 장점은 일단 서버가 돌아가면 SSH로 서버에 접속할 일이 별로 없다는 것이다. 대부분 관리는 웹 브라우저로 가능하다. diff --git a/book/04-git-server/sections/gitweb.asc b/book/04-git-server/sections/gitweb.asc index 78124e62..8c3f3a94 100644 --- a/book/04-git-server/sections/gitweb.asc +++ b/book/04-git-server/sections/gitweb.asc @@ -54,7 +54,7 @@ $ git instaweb --httpd=webrick --stop ////////////////////////// If you want to run the web interface on a server all the time for your team or for an open source project you're hosting, you'll need to set up the CGI script to be served by your normal web server. Some Linux distributions have a `gitweb` package that you may be able to install via `apt` or `yum`, so you may want to try that first. -We'll walk though installing GitWeb manually very quickly. +We'll walk through installing GitWeb manually very quickly. First, you need to get the Git source code, which GitWeb comes with, and generate the custom CGI script: ////////////////////////// 자신의 프로젝트에서 언제나 웹 인터페이스를 운영하려면 먼저 웹서버에 이 CGI 스크립트를 설치해야 한다. diff --git a/book/04-git-server/sections/setting-up-server.asc b/book/04-git-server/sections/setting-up-server.asc index 40053e19..b006f40d 100644 --- a/book/04-git-server/sections/setting-up-server.asc +++ b/book/04-git-server/sections/setting-up-server.asc @@ -8,7 +8,7 @@ Let's walk through setting up SSH access on the server side. In this example, you'll use the `authorized_keys` method for authenticating your users. We also assume you're running a standard Linux distribution like Ubuntu. -First, you create a 'git' user and a `.ssh` directory for that user. +First, you create a `git` user and a `.ssh` directory for that user. ////////////////////////// 서버에서 설정하는 일을 살펴보자. 일단 Ubuntu같은 표준 리눅스 배포판을 사용한다고 가정한다. @@ -73,7 +73,7 @@ Initialized empty Git repository in /opt/git/project.git/ ////////////////////////// Then, John, Josie, or Jessica can push the first version of their project into that repository by adding it as a remote and pushing up a branch. Note that someone must shell onto the machine and create a bare repository every time you want to add a project. -Let's use `gitserver` as the hostname of the server on which you've set up your 'git' user and repository. +Let's use `gitserver` as the hostname of the server on which you've set up your `git` user and repository. If you're running it internally, and you set up DNS for `gitserver` to point to that server, then you can use the commands pretty much as is (assuming that `myproject` is an existing project with files in it): ////////////////////////// 이제 John씨, Josie씨, Jessica씨는 이 저장소를 리모트 저장소로 등록하고 나서 브랜치를 Push할 수 있다. @@ -112,13 +112,13 @@ With this method, you can quickly get a read/write Git server up and running for 이렇게 개발자들이 읽고 쓸 수 있는 Git 서버를 쉽게 만들 수 있다. ////////////////////////// -You should note that currently all these users can also log into the server and get a shell as the ``git'' user. If you want to restrict that, you will have to change the shell to something else in the `passwd` file. +You should note that currently all these users can also log into the server and get a shell as the `git' user. If you want to restrict that, you will have to change the shell to something else in the `passwd` file. ////////////////////////// 이 개발자들은 서버에 git 계정으로 로그인할 수 있다. 이를 막으려면 passwd 파일에서 로그인 쉘을 바꿔야한다. ////////////////////////// -You can easily restrict the 'git' user to only doing Git activities with a limited shell tool called `git-shell` that comes with Git. -If you set this as your 'git' user's login shell, then the 'git' user can't have normal shell access to your server. +You can easily restrict the `git` user to only doing Git activities with a limited shell tool called `git-shell` that comes with Git. +If you set this as your `git` user's login shell, then the `git` user can't have normal shell access to your server. To use this, specify `git-shell` instead of bash or csh for your user's login shell. To do so, you must first add `git-shell` to `/etc/shells` if it's not already there: ////////////////////////// @@ -145,7 +145,7 @@ $ sudo chsh git # and enter the path to git-shell, usually: /usr/bin/git-shell ---- ////////////////////////// -Now, the 'git' user can only use the SSH connection to push and pull Git repositories and can't shell onto the machine. +Now, the `git` user can only use the SSH connection to push and pull Git repositories and can't shell onto the machine. If you try, you'll see a login rejection like this: ////////////////////////// 이제 _git_계정으로 Push와 Pull을 할 수 있지만 서버의 쉘은 가질 수 없다. @@ -161,7 +161,7 @@ Connection to gitserver closed. ////////////////////////// Now Git network commands will still work just fine but the users won't be able to get a shell. -As the output states, you can also set up a directory in the ``git'' user's home directory that customizes the `git-shell` command a bit. +As the output states, you can also set up a directory in the `git` user's home directory that customizes the `git-shell` command a bit. For instance, you can restrict the Git commands that the server will accept or you can customize the message that users see if they try to SSH in like that. Run `git help shell` for more information on customizing the shell.(((git commands, help))) ////////////////////////// diff --git a/book/04-git-server/sections/smart-http.asc b/book/04-git-server/sections/smart-http.asc index 2ec1e82a..03a772b9 100644 --- a/book/04-git-server/sections/smart-http.asc +++ b/book/04-git-server/sections/smart-http.asc @@ -11,12 +11,12 @@ This CGI will read the path and headers sent by a `git fetch` or `git push` to a If the CGI sees that the client is smart, it will communicate smartly with it, otherwise it will fall back to the dumb behavior (so it is backward compatible for reads with older clients). ////////////////////////// 지금까지 인증 기능을 갖춘 SSH와 인증 기능이 없는 git 프로토콜을 배웠다. 이제는 이 두 기능을 한꺼번에 가진 프로토콜을 알아보자. -서버에서 `git-http-backend` 명령어를 이용해 일단 기본적인 스마트 HTTP를 지원하는 Git 서버를 실행한다.((git commands, "http-backend")) +서버에서 `git-http-backend` 명령어를 이용해 일단 기본적인 스마트 HTTP를 지원하는 Git 서버를 실행한다.(((git commands, "http-backend"))) Git 클라이언트에서 `git fetch`나 `git push`를 실행하면 서버로 HTTP 요청을 보낸다. 서버는 그 요청을 보고 경로와 헤더를 읽어 클라이언트가 HTTP로 통신하려 하는지 감지한다. 이는 1.6.6 버전 이상의 클라이언트에서 동작한다. 서버는 클라이언트가 스마트 HTTP 프로토콜을 지원한다고 판단되면 스마트 HTTP 프로토콜을 사용하고 아니면 멍청한 프로토콜을 계속 사용한다. 덕분에 하위 호환성이 잘 유지된다. ////////////////////////// -Let's walk though a very basic setup. We'll set this up with Apache as the CGI server. If you don't have Apache setup, you can do so on a Linux box with something like this:(((Apache))) +Let's walk through a very basic setup. We'll set this up with Apache as the CGI server. If you don't have Apache setup, you can do so on a Linux box with something like this:(((Apache))) ////////////////////////// 이제 설정해보자. CGI 서버로 아파치를 사용한다. 아파치가 없다면 리눅스에서는 다음과 같이 아파치를 설치할 수 있다(((Apache))). @@ -32,9 +32,9 @@ This also enables the `mod_cgi`, `mod_alias`, and `mod_env` modules, which are a 이 명령어 한 방이면 mod_cgi, mod_alias, mod_env도 사용할 수 있다. 다 앞으로 사용할 모듈들이다. ////////////////////////// -Next we need to add some things to the Apache configuration to run the `git http-backend` as the handler for anything coming into the `/git` path of your web server. +Next we need to add some things to the Apache configuration to run the `git-http-backend` as the handler for anything coming into the `/git` path of your web server. ////////////////////////// -그리고 아파치 설정 파일을 수정한다. 그러면 `git http-backend`를 실행했을 때 모든 요청을 `/git` 경로로 받을 수 있다. +그리고 `/git` 경로로 요청이 들어오면 `git-http-backend`가 핸들러로 실행되도록 아파치 설정을 수정한다. [source,console] ---- @@ -94,9 +94,9 @@ There are tons of ways to have Apache authenticate users, you'll have to choose 아파치에는 사용자 인증방법이 많다. 그중 하나를 골라 사용해야 하는데 위에 설명한 방법이 가장 간단한 방법의 하나다. 이 방법을 이용할 때는 대부분 SSL을 이용해 통신한다. ////////////////////////// -We don't want to go too far down the rabbit hole of Apache configuration specifics, since you could well be using a different server or have different authenication needs. The idea is that Git comes with a CGI called `git http-backend` that when invoked will do all the negotiation to send and receive data over HTTP. It does not implement any authentication itself, but that can easily be controlled at the layer of the web server that invokes it. You can do this with nearly any CGI-capable web server, so go with the one that you know best. +We don't want to go too far down the rabbit hole of Apache configuration specifics, since you could well be using a different server or have different authentication needs. The idea is that Git comes with a CGI called `git-http-backend` that when invoked will do all the negotiation to send and receive data over HTTP. It does not implement any authentication itself, but that can easily be controlled at the layer of the web server that invokes it. You can do this with nearly any CGI-capable web server, so go with the one that you know best. ////////////////////////// -웹 서버는 아파치 말고도 다른 서버를 사용할 수도 있고, 인증 방식도 다르므로 아파치 설정에 대해서 길게 이야기하지 않는다. 대신 이것만 알아두었으면 한다. HTTP를 이용한 모든 통신에서는 `git http-backend`와 Git을 함께 사용한다는 것이다. Git 그 자체로는 인증 기능을 가지고 있지 않다. 하지만 웹 서버의 인증 레이어와 손쉽게 연동할 수 있게 돼있다. CGI를 실행할 수 있는 웹 서버라면 어떤 서버든지 붙일 수 있다. 가장 좋아하는 서버를 사용하길 바란다. +웹 서버는 아파치 말고도 다른 서버를 사용할 수도 있고, 인증 방식도 다르므로 아파치 설정에 대해서 길게 이야기하지 않는다. 대신 이것만 알아두었으면 한다. HTTP를 이용한 모든 통신에서는 `git-http-backend`와 Git을 함께 사용한다는 것이다. Git 그 자체로는 인증 기능을 가지고 있지 않다. 하지만 웹 서버의 인증 레이어와 손쉽게 연동할 수 있게 돼있다. CGI를 실행할 수 있는 웹 서버라면 어떤 서버든지 붙일 수 있다. 가장 좋아하는 서버를 사용하길 바란다. [NOTE] ////////////////////////// diff --git a/book/05-distributed-git/images/benevolent-dictator.png b/book/05-distributed-git/images/benevolent-dictator.png index e9420ab5..a742a2ed 100644 Binary files a/book/05-distributed-git/images/benevolent-dictator.png and b/book/05-distributed-git/images/benevolent-dictator.png differ diff --git a/book/05-distributed-git/images/git-diff-check.png b/book/05-distributed-git/images/git-diff-check.png index 438027c4..5dc9ae40 100644 Binary files a/book/05-distributed-git/images/git-diff-check.png and b/book/05-distributed-git/images/git-diff-check.png differ diff --git a/book/05-distributed-git/images/integration-manager.png b/book/05-distributed-git/images/integration-manager.png index a307d5a3..c877f592 100644 Binary files a/book/05-distributed-git/images/integration-manager.png and b/book/05-distributed-git/images/integration-manager.png differ diff --git a/book/05-distributed-git/images/large-merges-1.png b/book/05-distributed-git/images/large-merges-1.png index 6e5a7962..b4910f2d 100644 Binary files a/book/05-distributed-git/images/large-merges-1.png and b/book/05-distributed-git/images/large-merges-1.png differ diff --git a/book/05-distributed-git/images/large-merges-2.png b/book/05-distributed-git/images/large-merges-2.png index 89369125..0fa474d1 100644 Binary files a/book/05-distributed-git/images/large-merges-2.png and b/book/05-distributed-git/images/large-merges-2.png differ diff --git a/book/05-distributed-git/images/managed-team-1.png b/book/05-distributed-git/images/managed-team-1.png index f564f87b..84c6f1fb 100644 Binary files a/book/05-distributed-git/images/managed-team-1.png and b/book/05-distributed-git/images/managed-team-1.png differ diff --git a/book/05-distributed-git/images/managed-team-2.png b/book/05-distributed-git/images/managed-team-2.png index ce7122e6..677e095d 100644 Binary files a/book/05-distributed-git/images/managed-team-2.png and b/book/05-distributed-git/images/managed-team-2.png differ diff --git a/book/05-distributed-git/images/managed-team-3.png b/book/05-distributed-git/images/managed-team-3.png index e971ae75..b2f3e07c 100644 Binary files a/book/05-distributed-git/images/managed-team-3.png and b/book/05-distributed-git/images/managed-team-3.png differ diff --git a/book/05-distributed-git/images/managed-team-flow.png b/book/05-distributed-git/images/managed-team-flow.png index c01b4bc7..9e4d93f5 100644 Binary files a/book/05-distributed-git/images/managed-team-flow.png and b/book/05-distributed-git/images/managed-team-flow.png differ diff --git a/book/05-distributed-git/images/merging-workflows-1.png b/book/05-distributed-git/images/merging-workflows-1.png index 3718d398..54a96fc0 100644 Binary files a/book/05-distributed-git/images/merging-workflows-1.png and b/book/05-distributed-git/images/merging-workflows-1.png differ diff --git a/book/05-distributed-git/images/merging-workflows-2.png b/book/05-distributed-git/images/merging-workflows-2.png index 42c554ce..6417c3de 100644 Binary files a/book/05-distributed-git/images/merging-workflows-2.png and b/book/05-distributed-git/images/merging-workflows-2.png differ diff --git a/book/05-distributed-git/images/merging-workflows-3.png b/book/05-distributed-git/images/merging-workflows-3.png index 6ccde852..1cb18c84 100644 Binary files a/book/05-distributed-git/images/merging-workflows-3.png and b/book/05-distributed-git/images/merging-workflows-3.png differ diff --git a/book/05-distributed-git/images/merging-workflows-4.png b/book/05-distributed-git/images/merging-workflows-4.png index 44ee33c0..d2f079e6 100644 Binary files a/book/05-distributed-git/images/merging-workflows-4.png and b/book/05-distributed-git/images/merging-workflows-4.png differ diff --git a/book/05-distributed-git/images/merging-workflows-5.png b/book/05-distributed-git/images/merging-workflows-5.png index 88a696a3..2eb25720 100644 Binary files a/book/05-distributed-git/images/merging-workflows-5.png and b/book/05-distributed-git/images/merging-workflows-5.png differ diff --git a/book/05-distributed-git/images/public-small-1.png b/book/05-distributed-git/images/public-small-1.png index 30fa0e33..afc27b29 100644 Binary files a/book/05-distributed-git/images/public-small-1.png and b/book/05-distributed-git/images/public-small-1.png differ diff --git a/book/05-distributed-git/images/public-small-2.png b/book/05-distributed-git/images/public-small-2.png index 04431ed5..8632c0c3 100644 Binary files a/book/05-distributed-git/images/public-small-2.png and b/book/05-distributed-git/images/public-small-2.png differ diff --git a/book/05-distributed-git/images/public-small-3.png b/book/05-distributed-git/images/public-small-3.png index 9acb3f12..c2c33f14 100644 Binary files a/book/05-distributed-git/images/public-small-3.png and b/book/05-distributed-git/images/public-small-3.png differ diff --git a/book/05-distributed-git/images/rebasing-1.png b/book/05-distributed-git/images/rebasing-1.png index 85e8cdba..a66f47cd 100644 Binary files a/book/05-distributed-git/images/rebasing-1.png and b/book/05-distributed-git/images/rebasing-1.png differ diff --git a/book/05-distributed-git/images/rebasing-2.png b/book/05-distributed-git/images/rebasing-2.png index 3aa4cd1b..7be83863 100644 Binary files a/book/05-distributed-git/images/rebasing-2.png and b/book/05-distributed-git/images/rebasing-2.png differ diff --git a/book/05-distributed-git/images/small-team-1.png b/book/05-distributed-git/images/small-team-1.png index 7aca6e2b..f821bf6a 100644 Binary files a/book/05-distributed-git/images/small-team-1.png and b/book/05-distributed-git/images/small-team-1.png differ diff --git a/book/05-distributed-git/images/small-team-2.png b/book/05-distributed-git/images/small-team-2.png index 715f3cad..33e88eac 100644 Binary files a/book/05-distributed-git/images/small-team-2.png and b/book/05-distributed-git/images/small-team-2.png differ diff --git a/book/05-distributed-git/images/small-team-3.png b/book/05-distributed-git/images/small-team-3.png index 082b8771..9cddbb43 100644 Binary files a/book/05-distributed-git/images/small-team-3.png and b/book/05-distributed-git/images/small-team-3.png differ diff --git a/book/05-distributed-git/images/small-team-4.png b/book/05-distributed-git/images/small-team-4.png index 7a3202c4..abaeee34 100644 Binary files a/book/05-distributed-git/images/small-team-4.png and b/book/05-distributed-git/images/small-team-4.png differ diff --git a/book/05-distributed-git/images/small-team-5.png b/book/05-distributed-git/images/small-team-5.png index 362aee9f..ef3bba19 100644 Binary files a/book/05-distributed-git/images/small-team-5.png and b/book/05-distributed-git/images/small-team-5.png differ diff --git a/book/05-distributed-git/images/small-team-6.png b/book/05-distributed-git/images/small-team-6.png index 8d4884fb..16f429be 100644 Binary files a/book/05-distributed-git/images/small-team-6.png and b/book/05-distributed-git/images/small-team-6.png differ diff --git a/book/05-distributed-git/images/small-team-7.png b/book/05-distributed-git/images/small-team-7.png index 53d35920..ee6934d8 100644 Binary files a/book/05-distributed-git/images/small-team-7.png and b/book/05-distributed-git/images/small-team-7.png differ diff --git a/book/05-distributed-git/images/small-team-flow.png b/book/05-distributed-git/images/small-team-flow.png index 893443d7..846e2c30 100644 Binary files a/book/05-distributed-git/images/small-team-flow.png and b/book/05-distributed-git/images/small-team-flow.png differ diff --git a/book/05-distributed-git/sections/contributing.asc b/book/05-distributed-git/sections/contributing.asc index ce0bb398..bdb15d69 100644 --- a/book/05-distributed-git/sections/contributing.asc +++ b/book/05-distributed-git/sections/contributing.asc @@ -90,11 +90,11 @@ Git provides an easy way to check for this – before you commit, run `git diff Git은 공백문자를 검사해볼 수 있는 간단한 명령을 제공한다. 커밋을 하기 전에 `git diff --check` 명령으로 공백문자에 대한 오류를 확인할 수 있다. ////////////////////////// -.Output of `git diff -check`. -image::images/git-diff-check.png[Output of `git diff -check`.] +.Output of `git diff --check`. +image::images/git-diff-check.png[Output of `git diff --check`.] ////////////////////////// -.`git diff -check`의 결과. -image::images/git-diff-check.png[`git diff -check`의 결과.] +.`git diff --check`의 결과. +image::images/git-diff-check.png[`git diff --check`의 결과.] ////////////////////////// If you run that command before committing, you can tell if you're about to commit whitespace issues that may annoy other developers. @@ -696,7 +696,7 @@ Also notice the `-u` flag; this is short for `--set-upstream`, which configures 명령에서 사용한 `-u` 옵션은 `--set-upstream` 옵션의 짧은 표현인데 브랜치를 추적하도록 설정해서 이후 Push나 Pull을 할 때 좀 더 편하게 사용할 수 있다. ////////////////////////// -Next, John e-mails Jessica to say he's pushed some changes to the `featureA` branch and ask her to verify them. +Next, John e-mails Jessica to say he's pushed some changes to the `featureA` branch and asks her to verify them. She runs a `git fetch` to pull down those changes: ////////////////////////// John씨가 몇 가지 작업을 하고 나서 `featureA` 에 Push했고 확인해 달라는 내용의 이메일을 보내왔다. @@ -878,7 +878,7 @@ $ git push -u myfork featureA (((git commands, request-pull))) ////////////////////////// When your work has been pushed up to your fork, you need to notify the maintainer. -This is often called a pull request, and you can either generate it via the website – GitHub has it's own Pull Request mechanism that we'll go over in <<_github>> – or you can run the `git request-pull` command and e-mail the output to the project maintainer manually. +This is often called a pull request, and you can either generate it via the website – GitHub has its own Pull Request mechanism that we'll go over in <<_github>> – or you can run the `git request-pull` command and e-mail the output to the project maintainer manually. ////////////////////////// Fork한 저장소에 Push하고 나면 프로젝트 관리자에게 이 내용을 알려야 한다. 이것을 'Pull Request'라고 한다. Git 호스팅 사이트에서 관리자에게 보낼 메시지를 생성하거나 `git request-pull` 명령으로 이메일을 수동으로 만들 수 있다. GitHub의 "pull request" 버튼은 자동으로 메시지를 만들어 주는데 관련 내용은 <<_github>> 에서 살펴볼 수 있다.. diff --git a/book/05-distributed-git/sections/distributed-workflows.asc b/book/05-distributed-git/sections/distributed-workflows.asc index a03d6bb9..3f639a98 100644 --- a/book/05-distributed-git/sections/distributed-workflows.asc +++ b/book/05-distributed-git/sections/distributed-workflows.asc @@ -34,10 +34,10 @@ A number of developers are nodes – consumers of that hub – and synchronize t ////////////////////////// .Centralized workflow. -image::images/centralized.png[Centralized workflow.] +image::images/centralized_workflow.png[Centralized workflow.] ////////////////////////// .중앙집중식 Workflow. -image::images/centralized.png[중앙집중식 Workflow.] +image::images/centralized_workflow.png[중앙집중식 Workflow.] ////////////////////////// This means that if two developers clone from the hub and both make changes, the first developer to push their changes back up can do so with no problems. diff --git a/book/06-github/callouts/1.png b/book/06-github/callouts/1.png index 7d473430..b6cbbc5e 100755 Binary files a/book/06-github/callouts/1.png and b/book/06-github/callouts/1.png differ diff --git a/book/06-github/callouts/10.png b/book/06-github/callouts/10.png index 997bbc82..80872645 100755 Binary files a/book/06-github/callouts/10.png and b/book/06-github/callouts/10.png differ diff --git a/book/06-github/callouts/2.png b/book/06-github/callouts/2.png index 5d09341b..4bb6abc0 100755 Binary files a/book/06-github/callouts/2.png and b/book/06-github/callouts/2.png differ diff --git a/book/06-github/callouts/3.png b/book/06-github/callouts/3.png index ef7b7004..e132a559 100755 Binary files a/book/06-github/callouts/3.png and b/book/06-github/callouts/3.png differ diff --git a/book/06-github/callouts/4.png b/book/06-github/callouts/4.png index adb8364e..3bc4c363 100755 Binary files a/book/06-github/callouts/4.png and b/book/06-github/callouts/4.png differ diff --git a/book/06-github/callouts/5.png b/book/06-github/callouts/5.png index 4d7eb460..76375432 100755 Binary files a/book/06-github/callouts/5.png and b/book/06-github/callouts/5.png differ diff --git a/book/06-github/callouts/6.png b/book/06-github/callouts/6.png index 0ba694af..a4465d34 100755 Binary files a/book/06-github/callouts/6.png and b/book/06-github/callouts/6.png differ diff --git a/book/06-github/callouts/7.png b/book/06-github/callouts/7.png index 472e96f8..009bf1a1 100755 Binary files a/book/06-github/callouts/7.png and b/book/06-github/callouts/7.png differ diff --git a/book/06-github/callouts/8.png b/book/06-github/callouts/8.png index 5e60973c..2470994e 100755 Binary files a/book/06-github/callouts/8.png and b/book/06-github/callouts/8.png differ diff --git a/book/06-github/callouts/9.png b/book/06-github/callouts/9.png index a0676d26..b4cbcac4 100755 Binary files a/book/06-github/callouts/9.png and b/book/06-github/callouts/9.png differ diff --git a/book/06-github/images/2fa-1.png b/book/06-github/images/2fa-1.png index d6916a88..20a6e599 100644 Binary files a/book/06-github/images/2fa-1.png and b/book/06-github/images/2fa-1.png differ diff --git a/book/06-github/images/account-settings.png b/book/06-github/images/account-settings.png index 23cf14a1..622171a6 100644 Binary files a/book/06-github/images/account-settings.png and b/book/06-github/images/account-settings.png differ diff --git a/book/06-github/images/avatar-crop.png b/book/06-github/images/avatar-crop.png index ad9b479e..cd1671ae 100644 Binary files a/book/06-github/images/avatar-crop.png and b/book/06-github/images/avatar-crop.png differ diff --git a/book/06-github/images/blink-01-start.png b/book/06-github/images/blink-01-start.png index 1113d9bf..be140e19 100644 Binary files a/book/06-github/images/blink-01-start.png and b/book/06-github/images/blink-01-start.png differ diff --git a/book/06-github/images/blink-02-pr.png b/book/06-github/images/blink-02-pr.png index 097600f0..96816571 100644 Binary files a/book/06-github/images/blink-02-pr.png and b/book/06-github/images/blink-02-pr.png differ diff --git a/book/06-github/images/blink-03-pull-request-open.png b/book/06-github/images/blink-03-pull-request-open.png index 7dc278f4..70350865 100644 Binary files a/book/06-github/images/blink-03-pull-request-open.png and b/book/06-github/images/blink-03-pull-request-open.png differ diff --git a/book/06-github/images/blink-04-email.png b/book/06-github/images/blink-04-email.png index 8b033bfc..af3090e7 100644 Binary files a/book/06-github/images/blink-04-email.png and b/book/06-github/images/blink-04-email.png differ diff --git a/book/06-github/images/blink-04-pr-comment.png b/book/06-github/images/blink-04-pr-comment.png index e4f2d458..4e31e773 100644 Binary files a/book/06-github/images/blink-04-pr-comment.png and b/book/06-github/images/blink-04-pr-comment.png differ diff --git a/book/06-github/images/blink-05-general-comment.png b/book/06-github/images/blink-05-general-comment.png index 582f99ad..1c3f4f3e 100644 Binary files a/book/06-github/images/blink-05-general-comment.png and b/book/06-github/images/blink-05-general-comment.png differ diff --git a/book/06-github/images/blink-06-final.png b/book/06-github/images/blink-06-final.png index d55d0b26..06dc9de6 100644 Binary files a/book/06-github/images/blink-06-final.png and b/book/06-github/images/blink-06-final.png differ diff --git a/book/06-github/images/blink-pull-request-open.png b/book/06-github/images/blink-pull-request-open.png index ef768bef..3c43df3c 100644 Binary files a/book/06-github/images/blink-pull-request-open.png and b/book/06-github/images/blink-pull-request-open.png differ diff --git a/book/06-github/images/collaborators.png b/book/06-github/images/collaborators.png index d5dd2d5d..ba126100 100644 Binary files a/book/06-github/images/collaborators.png and b/book/06-github/images/collaborators.png differ diff --git a/book/06-github/images/email-settings.png b/book/06-github/images/email-settings.png index 2310d7c0..0291aeac 100644 Binary files a/book/06-github/images/email-settings.png and b/book/06-github/images/email-settings.png differ diff --git a/book/06-github/images/emoji.png b/book/06-github/images/emoji.png index 53744657..83c8cd21 100644 Binary files a/book/06-github/images/emoji.png and b/book/06-github/images/emoji.png differ diff --git a/book/06-github/images/forkbutton.png b/book/06-github/images/forkbutton.png index e19f6a0d..9bc4c798 100644 Binary files a/book/06-github/images/forkbutton.png and b/book/06-github/images/forkbutton.png differ diff --git a/book/06-github/images/hubot.png b/book/06-github/images/hubot.png index 249fa432..510b265f 100644 Binary files a/book/06-github/images/hubot.png and b/book/06-github/images/hubot.png differ diff --git a/book/06-github/images/maint-01-email.png b/book/06-github/images/maint-01-email.png index 0e71dbbb..1477b36d 100644 Binary files a/book/06-github/images/maint-01-email.png and b/book/06-github/images/maint-01-email.png differ diff --git a/book/06-github/images/maint-02-merge.png b/book/06-github/images/maint-02-merge.png index e715dd11..69efa4b6 100644 Binary files a/book/06-github/images/maint-02-merge.png and b/book/06-github/images/maint-02-merge.png differ diff --git a/book/06-github/images/maint-03-email-resp.png b/book/06-github/images/maint-03-email-resp.png index b60bca6a..dbd3e648 100644 Binary files a/book/06-github/images/maint-03-email-resp.png and b/book/06-github/images/maint-03-email-resp.png differ diff --git a/book/06-github/images/maint-04-target.png b/book/06-github/images/maint-04-target.png index ed2b9ce5..0b153962 100644 Binary files a/book/06-github/images/maint-04-target.png and b/book/06-github/images/maint-04-target.png differ diff --git a/book/06-github/images/maint-05-mentions.png b/book/06-github/images/maint-05-mentions.png index 0d0d1484..35b60f3d 100644 Binary files a/book/06-github/images/maint-05-mentions.png and b/book/06-github/images/maint-05-mentions.png differ diff --git a/book/06-github/images/maint-06-unsubscribe.png b/book/06-github/images/maint-06-unsubscribe.png index 0abb083e..eaf6e2cf 100644 Binary files a/book/06-github/images/maint-06-unsubscribe.png and b/book/06-github/images/maint-06-unsubscribe.png differ diff --git a/book/06-github/images/maint-07-notifications.png b/book/06-github/images/maint-07-notifications.png index de355c29..7d07a4b2 100644 Binary files a/book/06-github/images/maint-07-notifications.png and b/book/06-github/images/maint-07-notifications.png differ diff --git a/book/06-github/images/maint-08-notifications-page.png b/book/06-github/images/maint-08-notifications-page.png index 077500d5..d4998614 100644 Binary files a/book/06-github/images/maint-08-notifications-page.png and b/book/06-github/images/maint-08-notifications-page.png differ diff --git a/book/06-github/images/maint-09-contrib.png b/book/06-github/images/maint-09-contrib.png index 5384a3b3..f6d9af3c 100644 Binary files a/book/06-github/images/maint-09-contrib.png and b/book/06-github/images/maint-09-contrib.png differ diff --git a/book/06-github/images/maint-10-default-branch.png b/book/06-github/images/maint-10-default-branch.png index f05bd98d..bd251d6c 100644 Binary files a/book/06-github/images/maint-10-default-branch.png and b/book/06-github/images/maint-10-default-branch.png differ diff --git a/book/06-github/images/maint-11-transfer.png b/book/06-github/images/maint-11-transfer.png index 4bd14cd8..5dc5724c 100644 Binary files a/book/06-github/images/maint-11-transfer.png and b/book/06-github/images/maint-11-transfer.png differ diff --git a/book/06-github/images/markdown-01-example.png b/book/06-github/images/markdown-01-example.png index 71d37401..10bbf18c 100644 Binary files a/book/06-github/images/markdown-01-example.png and b/book/06-github/images/markdown-01-example.png differ diff --git a/book/06-github/images/markdown-02-tasks.png b/book/06-github/images/markdown-02-tasks.png index 3dfef446..6dafbc73 100644 Binary files a/book/06-github/images/markdown-02-tasks.png and b/book/06-github/images/markdown-02-tasks.png differ diff --git a/book/06-github/images/markdown-03-task-summary.png b/book/06-github/images/markdown-03-task-summary.png index ab2c7e36..536aa094 100644 Binary files a/book/06-github/images/markdown-03-task-summary.png and b/book/06-github/images/markdown-03-task-summary.png differ diff --git a/book/06-github/images/markdown-04-fenced-code.png b/book/06-github/images/markdown-04-fenced-code.png index 3db72dd5..ca3482f9 100644 Binary files a/book/06-github/images/markdown-04-fenced-code.png and b/book/06-github/images/markdown-04-fenced-code.png differ diff --git a/book/06-github/images/markdown-05-quote.png b/book/06-github/images/markdown-05-quote.png index cb671280..02a8451a 100644 Binary files a/book/06-github/images/markdown-05-quote.png and b/book/06-github/images/markdown-05-quote.png differ diff --git a/book/06-github/images/markdown-06-emoji-complete.png b/book/06-github/images/markdown-06-emoji-complete.png index 51f9ca27..ce949200 100644 Binary files a/book/06-github/images/markdown-06-emoji-complete.png and b/book/06-github/images/markdown-06-emoji-complete.png differ diff --git a/book/06-github/images/markdown-07-emoji.png b/book/06-github/images/markdown-07-emoji.png index 4b4669e4..b535756d 100644 Binary files a/book/06-github/images/markdown-07-emoji.png and b/book/06-github/images/markdown-07-emoji.png differ diff --git a/book/06-github/images/markdown-08-drag-drop.png b/book/06-github/images/markdown-08-drag-drop.png index 99c81644..1dfb3b98 100644 Binary files a/book/06-github/images/markdown-08-drag-drop.png and b/book/06-github/images/markdown-08-drag-drop.png differ diff --git a/book/06-github/images/mentions-01-syntax.png b/book/06-github/images/mentions-01-syntax.png index 052be9fa..c960b0c9 100644 Binary files a/book/06-github/images/mentions-01-syntax.png and b/book/06-github/images/mentions-01-syntax.png differ diff --git a/book/06-github/images/mentions-02-render.png b/book/06-github/images/mentions-02-render.png index fa0eff97..5b4bfee3 100644 Binary files a/book/06-github/images/mentions-02-render.png and b/book/06-github/images/mentions-02-render.png differ diff --git a/book/06-github/images/mentions-03-closed.png b/book/06-github/images/mentions-03-closed.png index 184c2a3c..cf3ef9e2 100644 Binary files a/book/06-github/images/mentions-03-closed.png and b/book/06-github/images/mentions-03-closed.png differ diff --git a/book/06-github/images/new-repo.png b/book/06-github/images/new-repo.png index 364c4b4d..485515bd 100644 Binary files a/book/06-github/images/new-repo.png and b/book/06-github/images/new-repo.png differ diff --git a/book/06-github/images/neworg.png b/book/06-github/images/neworg.png index d1a8b0bd..db47fff0 100644 Binary files a/book/06-github/images/neworg.png and b/book/06-github/images/neworg.png differ diff --git a/book/06-github/images/newrepo.png b/book/06-github/images/newrepo.png index 5d1bd033..cd508f16 100644 Binary files a/book/06-github/images/newrepo.png and b/book/06-github/images/newrepo.png differ diff --git a/book/06-github/images/newrepoform.png b/book/06-github/images/newrepoform.png index 46ba2dff..28fa6a7e 100644 Binary files a/book/06-github/images/newrepoform.png and b/book/06-github/images/newrepoform.png differ diff --git a/book/06-github/images/notifications.png b/book/06-github/images/notifications.png index c2b44b88..6768db4d 100644 Binary files a/book/06-github/images/notifications.png and b/book/06-github/images/notifications.png differ diff --git a/book/06-github/images/orgs-01-page.png b/book/06-github/images/orgs-01-page.png index a3036ff3..149773fe 100644 Binary files a/book/06-github/images/orgs-01-page.png and b/book/06-github/images/orgs-01-page.png differ diff --git a/book/06-github/images/orgs-02-teams.png b/book/06-github/images/orgs-02-teams.png index 44429258..46f5f2ce 100644 Binary files a/book/06-github/images/orgs-02-teams.png and b/book/06-github/images/orgs-02-teams.png differ diff --git a/book/06-github/images/orgs-03-audit.png b/book/06-github/images/orgs-03-audit.png index 11aac64f..4f063989 100644 Binary files a/book/06-github/images/orgs-03-audit.png and b/book/06-github/images/orgs-03-audit.png differ diff --git a/book/06-github/images/pr-01-fail.png b/book/06-github/images/pr-01-fail.png index f4f90f48..80331c1d 100644 Binary files a/book/06-github/images/pr-01-fail.png and b/book/06-github/images/pr-01-fail.png differ diff --git a/book/06-github/images/pr-02-merge-fix.png b/book/06-github/images/pr-02-merge-fix.png index 5ee25362..9da16322 100644 Binary files a/book/06-github/images/pr-02-merge-fix.png and b/book/06-github/images/pr-02-merge-fix.png differ diff --git a/book/06-github/images/reposettingslink.png b/book/06-github/images/reposettingslink.png index b36ba9c4..45e60162 100644 Binary files a/book/06-github/images/reposettingslink.png and b/book/06-github/images/reposettingslink.png differ diff --git a/book/06-github/images/scripting-01-services.png b/book/06-github/images/scripting-01-services.png index 977a78f4..07c20103 100644 Binary files a/book/06-github/images/scripting-01-services.png and b/book/06-github/images/scripting-01-services.png differ diff --git a/book/06-github/images/scripting-02-email-service.png b/book/06-github/images/scripting-02-email-service.png index 61be1814..209bfe76 100644 Binary files a/book/06-github/images/scripting-02-email-service.png and b/book/06-github/images/scripting-02-email-service.png differ diff --git a/book/06-github/images/scripting-03-webhook.png b/book/06-github/images/scripting-03-webhook.png index 16b31c87..103eb92a 100644 Binary files a/book/06-github/images/scripting-03-webhook.png and b/book/06-github/images/scripting-03-webhook.png differ diff --git a/book/06-github/images/scripting-04-webhook-debug.png b/book/06-github/images/scripting-04-webhook-debug.png index 5b99abab..617e41ee 100644 Binary files a/book/06-github/images/scripting-04-webhook-debug.png and b/book/06-github/images/scripting-04-webhook-debug.png differ diff --git a/book/06-github/images/scripting-05-access-token.png b/book/06-github/images/scripting-05-access-token.png index 1758506d..17507717 100644 Binary files a/book/06-github/images/scripting-05-access-token.png and b/book/06-github/images/scripting-05-access-token.png differ diff --git a/book/06-github/images/scripting-06-comment.png b/book/06-github/images/scripting-06-comment.png index d66b9aa7..52448174 100644 Binary files a/book/06-github/images/scripting-06-comment.png and b/book/06-github/images/scripting-06-comment.png differ diff --git a/book/06-github/images/scripting-07-status.png b/book/06-github/images/scripting-07-status.png index 3d9c3c02..a34314d9 100644 Binary files a/book/06-github/images/scripting-07-status.png and b/book/06-github/images/scripting-07-status.png differ diff --git a/book/06-github/images/signup.png b/book/06-github/images/signup.png index 196c0355..916a882c 100644 Binary files a/book/06-github/images/signup.png and b/book/06-github/images/signup.png differ diff --git a/book/06-github/images/ssh-keys.png b/book/06-github/images/ssh-keys.png index fab05058..b9dec471 100644 Binary files a/book/06-github/images/ssh-keys.png and b/book/06-github/images/ssh-keys.png differ diff --git a/book/06-github/images/your-profile.png b/book/06-github/images/your-profile.png index 22e2c4f8..50fa0c1e 100644 Binary files a/book/06-github/images/your-profile.png and b/book/06-github/images/your-profile.png differ diff --git a/book/06-github/sections/3-maintaining.asc b/book/06-github/sections/3-maintaining.asc index b7596d5c..51f29b16 100644 --- a/book/06-github/sections/3-maintaining.asc +++ b/book/06-github/sections/3-maintaining.asc @@ -659,7 +659,7 @@ If you would like to transfer a project to another user or an organization in Gi [[_transfer_project]] ////////////////////////// -.Transfer a project to anther GitHub user or Organization. +.Transfer a project to another GitHub user or Organization. image::images/maint-11-transfer.png[Transfer] ////////////////////////// .다른 GitHub 사용자나 기관에 프로젝트 넘기기.