Git进阶指南：Pro Git 2nd Edition精髓

需积分: 3 66 浏览量更新于2024-07-18 收藏 11.55MB PDF 举报

"Pro Git 2nd Edition 是一本关于Git的高级指南，旨在帮助读者深入理解和熟练使用Git版本控制系统。本书由Scott Chacon和Ben Straub撰写，涵盖了Git的基础知识，如安装、基本操作、分支管理和远程协作，以及更高级的主题，如分布式工作流、服务器配置和GitHub的使用。" 在Git基础部分，作者介绍了为什么使用版本控制系统（VCS）的重要性，特别是对于图形或网页设计师，以便保存每个设计版本。Git作为一个强大的VCS，允许用户回滚到以前的文件状态，查看项目历史，比较变更，追踪问题源头，以及恢复丢失的文件。初学者可以学习如何安装Git，进行首次设置，获取帮助，以及如何创建和管理自己的Git仓库。 Git的基本操作包括如何创建新的Git仓库，记录更改到仓库，查看提交历史，以及撤销操作。这些章节详细解释了`git add`、`git commit`、`git log`和`git reset`等命令的用法。此外，还介绍了如何与远程仓库交互，进行拉取和推送操作，以及如何创建和管理标签，提高工作效率。分支是Git的核心特性之一。书中详细讲解了分支的概念，基本的分支和合并操作，以及如何有效地管理分支。还探讨了不同分支工作流程，包括主分支策略、开发分支和特性分支的使用。另外，还涉及了远程分支和重基操作，这些对于团队协作尤其重要。 Git服务器配置部分，讲解了Git与其他服务器之间的通信协议，如何在服务器上安装和设置Git，包括SSH密钥的生成，以及使用Git Daemon、Smart HTTP和GitLab等方法托管Git仓库。此外，还提到了一些第三方托管服务，如GitHub。分布式Git章节深入讨论了分布式工作流，指导读者如何贡献和维护项目，包括如何发起拉取请求和合并代码。这部分内容对开源项目参与者尤其有价值。 GitHub章节则专注于在GitHub平台上设置账户、配置个人资料，以及如何在GitHub上参与和维护项目。无论是作为贡献者还是项目维护者，这部分内容提供了实用的技巧和最佳实践。《Pro Git 2nd Edition》是一本全面而深入的Git教程，适合从新手到高级用户的各个层次，通过这本书，读者可以系统地学习和掌握Git的各种功能，从而更高效地进行代码管理和协作。

For example, to browse the history of the project, Git doesn’t need to go out to the server to get the

history and display it for you — it simply reads it directly from your local database. This means you

see the project history almost instantly. If you want to see the changes introduced between the

current version of a file and the file a month ago, Git can look up the file a month ago and do a local

difference calculation, instead of having to either ask a remote server to do it or pull an older

version of the file from the remote server to do it locally.

This also means that there is very little you can’t do if you’re offline or off VPN. If you get on an

airplane or a train and want to do a little work, you can commit happily (to your local copy,

remember?) until you get to a network connection to upload. If you go home and can’t get your VPN

client working properly, you can still work. In many other systems, doing so is either impossible or

painful. In Perforce, for example, you can’t do much when you aren’t connected to the server; and

in Subversion and CVS, you can edit files, but you can’t commit changes to your database (because

your database is offline). This may not seem like a huge deal, but you may be surprised what a big

difference it can make.

Git Has Integrity

Everything in Git is check-summed before it is stored and is then referred to by that checksum. This

means it’s impossible to change the contents of any file or directory without Git knowing about it.

This functionality is built into Git at the lowest levels and is integral to its philosophy. You can’t lose

information in transit or get file corruption without Git being able to detect it.

The mechanism that Git uses for this checksumming is called a SHA-1 hash. This is a 40-character

string composed of hexadecimal characters (0–9 and a–f) and calculated based on the contents of a

file or directory structure in Git. A SHA-1 hash looks something like this:

24b9da6552252987aa493b52f8696cd6d3b00373

You will see these hash values all over the place in Git because it uses them so much. In fact, Git

stores everything in its database not by file name but by the hash value of its contents.

Git Generally Only Adds Data

When you do actions in Git, nearly all of them only add data to the Git database. It is hard to get the

system to do anything that is not undoable or to make it erase data in any way. As with any VCS, you

can lose or mess up changes you haven’t committed yet, but after you commit a snapshot into Git, it

is very difficult to lose, especially if you regularly push your database to another repository.

This makes using Git a joy because we know we can experiment without the danger of severely

screwing things up. For a more in-depth look at how Git stores its data and how you can recover

data that seems lost, see Undoing Things.

The Three States

Pay attention now — here is the main thing to remember about Git if you want the rest of your

learning process to go smoothly. Git has three main states that your files can reside in: committed,

modified, and staged:

modified and was added to the staging area, it is staged. And if it was changed since it was checked

out but has not been staged, it is modified. In Git Basics, you’ll learn more about these states and

how you can either take advantage of them or skip the staged part entirely.

The Command Line

There are a lot of different ways to use Git. There are the original command-line tools, and there

are many graphical user interfaces of varying capabilities. For this book, we will be using Git on the

command line. For one, the command line is the only place you can run all Git commands – most of

the GUIs implement only a partial subset of Git functionality for simplicity. If you know how to run

the command-line version, you can probably also figure out how to run the GUI version, while the

opposite is not necessarily true. Also, while your choice of graphical client is a matter of personal

taste, all users will have the command-line tools installed and available.

So we will expect you to know how to open Terminal in Mac or Command Prompt or Powershell in

Windows. If you don’t know what we’re talking about here, you may need to stop and research that

quickly so that you can follow the rest of the examples and descriptions in this book.

Installing Git

Before you start using Git, you have to make it available on your computer. Even if it’s already

installed, it’s probably a good idea to update to the latest version. You can either install it as a

package or via another installer, or download the source code and compile it yourself.

NOTE

This book was written using Git version 2.0.0. Though most of the commands we

use should work even in ancient versions of Git, some of them might not or might

act slightly differently if you’re using an older version. Since Git is quite excellent at

preserving backwards compatibility, any version after 2.0 should work just fine.

Installing on Linux

If you want to install the basic Git tools on Linux via a binary installer, you can generally do so

through the basic package-management tool that comes with your distribution. If you’re on Fedora

for example (or any closely-related RPM-based distro such as RHEL or CentOS), you can use dnf:

$ sudo dnf install git-all

If you’re on a Debian-based distribution like Ubuntu, try apt-get:

$ sudo apt-get install git-all

For more options, there are instructions for installing on several different Unix flavors on the Git

website, at http://git-scm.com/download/linux.

itself; for more information on it, go to https://git-for-windows.github.io/.

To get an automated installation you can use the Git Chocolatey package. Note that the Chocolatey

package is community maintained.

Another easy way to get Git installed is by installing GitHub for Windows. The installer includes a

command line version of Git as well as the GUI. It also works well with Powershell, and sets up solid

credential caching and sane CRLF settings. We’ll learn more about those things a little later, but

suffice it to say they’re things you want. You can download this from the GitHub for Windows

website, at http://windows.github.com.

Installing from Source

Some people may instead find it useful to install Git from source, because you’ll get the most recent

version. The binary installers tend to be a bit behind, though as Git has matured in recent years,

this has made less of a difference.

If you do want to install Git from source, you need to have the following libraries that Git depends

on: autotools, curl, zlib, openssl, expat, and libiconv. For example, if you’re on a system that has dnf

(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:

$ sudo dnf install dh-autoreconf curl-devel expat-devel gettext-devel \

Ê openssl-devel perl-devel zlib-devel

$ sudo apt-get install dh-autoreconf 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 (Note: users of RHEL and RHEL-derivatives like CentOS and Scientific

Linux will have to enable the EPEL repository to download the docbook2X package):

$ sudo dnf install asciidoc xmlto docbook2X getopt

$ sudo apt-get install asciidoc xmlto docbook2x getopt

Additionally, if you’re using Fedora/RHEL/RHEL-derivatives, you need to do this

$ sudo ln -s /usr/bin/db2x_docbook2texi /usr/bin/docbook2x-texi

due to binary name differences.

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 website, at https://github.com/git/git/releases. It’s

generally a little clearer what the latest version is on the GitHub page, but the kernel.org page also

has release signatures if you want to verify your download.

Then, compile and install:

剩余505页未读，继续阅读

weixin_42876466

粉丝: 0
资源: 1

Git进阶指南：Pro Git 2nd Edition精髓

Pro git 2nd edition（第二版全英文）

Pro Git, 2nd Edition.pdf

Pro Git 2nd Edition - 官方Git教程更新

Pro Git (2nd Edition)

Git Pro 2nd Edition (2014) PDF免费下载

Pro Git, 2nd

ProGit2ndEditionNetworkingBook.pdf 英文原版

progit中文(第二版)[CHM格式]

Apress.Pro.JPA.2.2nd.Edition.Oct.2013

使用Git进行团队协作和版本控制的最佳实践

最新资源