Skip to content
1 change: 1 addition & 0 deletions BASE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
progit/progit2@f61c80195466a84ecda9b0cb5eacf473fc021459
Binary file modified book/01-introduction/images/areas.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified book/01-introduction/images/centralized.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified book/01-introduction/images/deltas.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified book/01-introduction/images/distributed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified book/01-introduction/images/git-osx-installer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified book/01-introduction/images/local.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified book/01-introduction/images/snapshots.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions book/01-introduction/sections/about-version-control.asc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
17 changes: 13 additions & 4 deletions book/01-introduction/sections/installing.asc
Original file line number Diff line number Diff line change
Expand Up @@ -129,17 +129,26 @@ 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

$ 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[].
Expand All @@ -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
Expand Down
Binary file modified book/02-git-basics/images/lifecycle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading