Skip to content

Commit 787c822

Browse files
Charlie O'KeefeCharlie O'Keefe
Charlie O'Keefe
authored and
Charlie O'Keefe
committed
Fixed line wrapping
1 parent 23561c6 commit 787c822

File tree

5 files changed

+29
-15
lines changed

5 files changed

+29
-15
lines changed

text/02_Git_Object_Db_Basics/0_ Git_Object_Db_Basics.markdown

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,8 @@ on top of your machine's filesystem.
4848
### Different from SVN ###
4949

5050
It is important to note that this is very different from most SCM systems
51-
that you may be familiar with. Subversion, CVS, Perforce, Mercurial and the like all use _Delta Storage_ systems - they store the differences between one commit and the next. Git does not do this - it stores a snapshot of what all the files in your project look like in this tree structure each time you commit. This is a very important concept to understand when using Git.
51+
that you may be familiar with. Subversion, CVS, Perforce, Mercurial and the
52+
like all use _Delta Storage_ systems - they store the differences between one
53+
commit and the next. Git does not do this - it stores a snapshot of what all
54+
the files in your project look like in this tree structure each time you
55+
commit. This is a very important concept to understand when using Git.

text/02_Git_Object_Db_Basics/1_Trees_and_Blobs.markdown

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,13 @@ As you can see, a tree object contains a list of entries, each with a
4949
mode, object type, SHA1 name, and name, sorted by name. It represents
5050
the contents of a single directory tree.
5151

52-
An object referenced by a tree may be blob, representing the contents of a file, or another tree, representing the contents of a subdirectory. Since trees and blobs, like all other objects, are named by the SHA1 hash of their
53-
contents, two trees have the same SHA1 name if and only if their
54-
contents (including, recursively, the contents of all subdirectories)
55-
are identical. This allows git to quickly determine the differences
56-
between two related tree objects, since it can ignore any entries with
57-
identical object names.
52+
An object referenced by a tree may be blob, representing the contents of a
53+
file, or another tree, representing the contents of a subdirectory. Since
54+
trees and blobs, like all other objects, are named by the SHA1 hash of their
55+
contents, two trees have the same SHA1 name if and only if their contents
56+
(including, recursively, the contents of all subdirectories) are identical.
57+
This allows git to quickly determine the differences between two related tree
58+
objects, since it can ignore any entries with identical object names.
5859

5960
(Note: in the presence of submodules, trees may also have commits as
6061
entries. See the **Submodules** section.)

text/02_Git_Object_Db_Basics/3_Trust_and_Tags.markdown

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@
33

44
[fig:object-tag]
55

6-
A tag object contains an object name (called simply 'object'), object type, tag name, the name of the person ("tagger") who created the tag, and a message, which may contain a signature, as can be seen using linkgit:git-cat-file[1]:
6+
A tag object contains an object name (called simply 'object'), object type,
7+
tag name, the name of the person ("tagger") who created the tag, and a
8+
message, which may contain a signature, as can be seen using
9+
linkgit:git-cat-file[1]:
710

811
$ git cat-file tag v1.5.0
912
object 437b1b20df4b356c9342dac8d38849f24ef44f27

text/02a_Git_Directory_and_Working_Directory/0_ Git_Directory_and_Working_Directory.markdown

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@
22

33
### The Git Directory ###
44

5-
The 'git directory' is the directory that stores all Git's history and meta information for your project - including all of the objects (commits, trees, blobs, tags), all of the pointers to where different branches are and more.
6-
7-
There is only one Git Directory per project (as opposed to one per subdirectory like with SVN or CVS), and that directory is (by default, though not necessarily) '.git' in the root of your project. If you look at the contents of that directory, you can see all of your important files:
5+
The 'git directory' is the directory that stores all Git's history and meta
6+
information for your project - including all of the objects (commits, trees,
7+
blobs, tags), all of the pointers to where different branches are and more.
8+
9+
There is only one Git Directory per project (as opposed to one per
10+
subdirectory like with SVN or CVS), and that directory is (by default, though
11+
not necessarily) '.git' in the root of your project. If you look at the
12+
contents of that directory, you can see all of your important files:
813

914
$>tree -L 1
1015
.

text/03_The_Git_Index/0_ The_Git_Index.markdown

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
The Git index is used as a staging area between your working directory
44
and your repository. You can use the index to build up a set of changes
5-
that you want to commit together. When you create a commit, what is committed is what is currently in the index, not what is in your working
6-
directory.
5+
that you want to commit together. When you create a commit, what is committed
6+
is what is currently in the index, not what is in your working directory.
77

88
### Looking at the Index ###
99

1010
The easiest way to see what is in the index is with the linkgit:git-status[1]
11-
command. When you run git status, you can see which files are staged (currently in your index),
12-
which are modified but not yet staged, and which are completely untracked.
11+
command. When you run git status, you can see which files are staged
12+
(currently in your index), which are modified but not yet staged, and which
13+
are completely untracked.
1314

1415
$>git status
1516
# On branch master

0 commit comments

Comments
 (0)