--- user-manual.html 2021-04-03 11:58:44.937710623 +0700 +++ user-manual.patched.html 2021-04-03 12:01:01.634421455 +0700 @@ -1,17 +1,17 @@ -
Table of Contents
Table of Contents
Git is a fast distributed revision control system.
This manual is designed to be readable by someone with basic UNIX command-line skills, but no previous knowledge of Git.
-Chapter 1, Repositories and Branches and Chapter 2, Exploring Git history explain how +
Chapter 2, Repositories and Branches and Chapter 3, Exploring Git history explain how to fetch and study a project using git—read these chapters to learn how to build and test a particular version of a software project, search for regressions, and so on.
People needing to do actual development will also want to read -Chapter 3, Developing with Git and Chapter 4, Sharing development with others.
+Chapter 4, Developing with Git and Chapter 5, Sharing development with others.Further chapters cover more specialized topics.
Comprehensive reference documentation is available through the man pages, or git-help(1) command. For example, for the command @@ -26,7 +26,7 @@
Finally, see Appendix B, Notes and todo list for this manual for ways that you can help make this manual more complete.
Table of Contents
Table of Contents
In fact, in Chapter 7, Git concepts we shall see that everything stored in Git +
In fact, in Chapter 8, Git concepts we shall see that everything stored in Git history, including file data and directory contents, is stored in an object with a name that is a hash of its contents.
Table of Contents
Table of Contents
Git is best thought of as a tool for storing the history of a collection of files. It does this by storing compressed snapshots of @@ -679,7 +679,7 @@
Table of Contents
Table of Contents
It is also possible to replace commits further back in the history, but this is an advanced topic to be left for -another chapter.
+another chapter.Table of Contents
Table of Contents
Now create the branches in which you are going to work; these start out
at the current tip of origin/master branch, and should be set up (using
the --track
option to git-branch(1)) to merge changes in from
@@ -1679,7 +1679,7 @@
Table of Contents
Table of Contents
Normally commits are only added to a project, never taken away or replaced. Git is designed with this assumption, and violating it will @@ -1923,7 +1923,7 @@ publishing.
Table of Contents
Table of Contents
Table of Contents
Table of Contents
Git is built on a small number of simple but powerful ideas. While it is possible to get things done without understanding them, you will find @@ -2141,7 +2141,7 @@ between two related tree objects, since it can ignore any entries with identical object names.
(Note: in the presence of submodules, trees may also have commits as -entries. See Chapter 8, Submodules for documentation.)
+entries. See Chapter 9, Submodules for documentation.)Note that the files all have mode 644 or 755: Git actually only pays attention to the executable bit.
The most common cause of dangling objects is that you’ve rebased a branch, or you have pulled from somebody else who rebased a branch—see -Chapter 5, Rewriting history and maintaining patch series. In that case, the old head of the original +Chapter 6, Rewriting history and maintaining patch series. In that case, the old head of the original branch still exists, as does everything it pointed to. The branch pointer itself just doesn’t, since you replaced it with another one.
There are also other situations that cause dangling objects. For @@ -2437,7 +2437,7 @@ information as long as you have the name of the tree that it described.
Table of Contents
Table of Contents
Large projects are often composed of smaller, self-contained modules. For example, an embedded Linux distribution’s source tree would include every @@ -2629,7 +2629,7 @@ warning about not being able switch from a dirty branch.
Table of Contents
Table of Contents
Many of the higher-level commands were originally implemented as shell scripts using a smaller core of low-level Git commands. These can still @@ -2891,7 +2891,7 @@
and that is what higher level git merge -s resolve
is implemented with.
Table of Contents
Table of Contents
This chapter covers internal details of the Git implementation which probably only Git developers need to understand.
@@ -3072,7 +3072,7 @@ itself!Table of Contents