Skip to content

Commit 1ac05a3

Browse files
committed
change all I to We
1 parent 8489b27 commit 1ac05a3

File tree

8 files changed

+13
-13
lines changed

8 files changed

+13
-13
lines changed

book/07-git-tools/sections/debugging.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ Another cool thing about Git is that it doesn’t track file renames explicitly.
3737
It records the snapshots and then tries to figure out what was renamed implicitly, after the fact.
3838
One of the interesting features of this is that you can ask it to figure out all sorts of code movement as well.
3939
If you pass `-C` to `git blame`, Git analyzes the file you’re annotating and tries to figure out where snippets of code within it originally came from if they were copied from elsewhere.
40-
Recently, I was refactoring a file named `GITServerHandler.m` into multiple files, one of which was `GITPackUpload.m`.
41-
By blaming `GITPackUpload.m` with the `-C` option, I could see where sections of the code originally came from:
40+
For example, say you are refactoring a file named `GITServerHandler.m` into multiple files, one of which is `GITPackUpload.m`.
41+
By blaming `GITPackUpload.m` with the `-C` option, you can see where sections of the code originally came from:
4242

4343
[source,shell]
4444
----

book/07-git-tools/sections/replace.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ c6e1e95 (history) fourth commit
6767
c1822cf first commit
6868
----
6969

70-
I think it's useful in this case to create a base commit that has instructions on how to expand the history, so other developers know what to do if they hit the first commit in the truncated history and need more. So, what we're going to do is create an initial commit object as our base point with instructions, then rebase the remaining commits (four and five) on top of it.
70+
It's useful in this case to create a base commit that has instructions on how to expand the history, so other developers know what to do if they hit the first commit in the truncated history and need more. So, what we're going to do is create an initial commit object as our base point with instructions, then rebase the remaining commits (four and five) on top of it.
7171

7272
To do that, we need to choose a point to split at, which for us is the third commit, which is `9c68fdc` in SHA-speak. So, our base commit will be based off of that tree. We can create our base commit using the `commit-tree` command, which just takes a tree and will give us a brand new, parentless commit object SHA back.
7373

book/07-git-tools/sections/rerere.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ To enable the `rerere` functionality, you simply have to run this config setting
1515
$ git config --global rerere.enabled true
1616
----
1717

18-
You can also turn it on by creating the `.git/rr-cache` directory in a specific repository, but I think the config setting is clearer, and it can be done globally.
18+
You can also turn it on by creating the `.git/rr-cache` directory in a specific repository, but the config setting is clearer and it can be done globally.
1919

2020
Now let's see a simple example. Let's say we have a file that looks like this:
2121

@@ -118,7 +118,7 @@ $ git rerere diff
118118
end
119119
----
120120

121-
So that basically says, when I see a hunk conflict in a `hello.rb` file that has ``hello mundo'' on one side and ``hola world'' on the other, resolve it to ``hola mundo''.
121+
So that basically says, when Git sees a hunk conflict in a `hello.rb` file that has ``hello mundo'' on one side and ``hola world'' on the other, it will resolve it to ``hola mundo''.
122122

123123
Now we can mark it as resolved and commit it:
124124

book/07-git-tools/sections/searching.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ If you need to be more specific, you can provide a regular expression to search
103103

104104
Another fairly advanced log search that is insanely useful is the line history search. This is a fairly recent addition and not very well known, but it can be really helpful. It is called with the `-L` option to `git log` and will show you the history of a function or line of code in your codebase.
105105

106-
For example, if I wanted to see every change made to the function `git_deflate_bound` in the `zlib.c` file, I could run `git log -L :git_deflate_bound:zlib.c`. This will try to figure out what the bounds of that function are and then look through the history and show me every change that was made to the function as a series of patches back to when the function was first created.
106+
For example, if we wanted to see every change made to the function `git_deflate_bound` in the `zlib.c` file, we could run `git log -L :git_deflate_bound:zlib.c`. This will try to figure out what the bounds of that function are and then look through the history and show me every change that was made to the function as a series of patches back to when the function was first created.
107107

108108
[source,shell]
109109
----

book/09-git-and-other-scms/sections/client-svn.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ If you're working with a team, and some are using SVN and others are using Git,
2929
To demonstrate this functionality, you need a typical SVN repository that you have write access to.
3030
If you want to copy these examples, you'll have to make a writeable copy of my test repository.
3131
In order to do that easily, you can use a tool called `svnsync` that comes with Subversion.
32-
For these tests, I created a new Subversion repository on Google Code that was a partial copy of the `protobuf` project, which is a tool that encodes structured data for network transmission.
32+
For these tests, we created a new Subversion repository on Google Code that was a partial copy of the `protobuf` project, which is a tool that encodes structured data for network transmission.
3333

3434
To follow along, you first need to create a new local Subversion repository:
3535

book/11-git-internals/1-git-internals.asc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
== Git Internals
33

44
You may have skipped to this chapter from a previous chapter, or you may have gotten here after reading the rest of the book – in either case, this is where you’ll go over the inner workings and implementation of Git.
5-
I found that learning this information was fundamentally important to understanding how useful and powerful Git is, but others have argued to me that it can be confusing and unnecessarily complex for beginners.
6-
Thus, I’ve made this discussion the last chapter in the book so you could read it early or later in your learning process.
7-
I leave it up to you to decide.
5+
We found that learning this information was fundamentally important to understanding how useful and powerful Git is, but others have argued to us that it can be confusing and unnecessarily complex for beginners.
6+
Thus, we’ve made this discussion the last chapter in the book so you could read it early or later in your learning process.
7+
We leave it up to you to decide.
88

99
Now that you’re here, let’s get started.
1010
First, if it isn’t yet clear, Git is fundamentally a content-addressable filesystem with a VCS user interface written on top of it.
@@ -38,4 +38,4 @@ This chapter has covered a number of plumbing commands – commands that are low
3838
Understanding how Git works at a lower level should make it easier to understand why it’s doing what it’s doing and also to write your own tools and helping scripts to make your specific workflow work for you.
3939

4040
Git as a content-addressable filesystem is a very powerful tool that you can easily use as more than just a VCS.
41-
I hope you can use your newfound knowledge of Git internals to implement your own cool application of this technology and feel more comfortable using Git in more advanced ways.
41+
We hope you can use your newfound knowledge of Git internals to implement your own cool application of this technology and feel more comfortable using Git in more advanced ways.

book/11-git-internals/sections/objects.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ image::images/data-model-3.png[All the objects in your Git directory.]
330330

331331
==== Object Storage
332332

333-
I mentioned earlier that a header is stored with the content.
333+
We mentioned earlier that a header is stored with the content.
334334
Let’s take a minute to look at how Git stores its objects.
335335
You’ll see how to store a blob object – in this case, the string ``what is up, doc?'' – interactively in the Ruby scripting language.
336336
You can start up interactive Ruby mode with the `irb` command:

book/11-git-internals/sections/refs.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ When you run commands like `git branch (branchname)`, Git basically runs that `u
7070
The question now is, when you run `git branch (branchname)`, how does Git know the SHA-1 of the last commit?
7171
The answer is the HEAD file.
7272
The HEAD file is a symbolic reference to the branch you’re currently on.
73-
By symbolic reference, I mean that unlike a normal reference, it doesn’t generally contain a SHA-1 value but rather a pointer to another reference.
73+
By symbolic reference, we mean that unlike a normal reference, it doesn’t generally contain a SHA-1 value but rather a pointer to another reference.
7474
If you look at the file, you’ll normally see something like this:
7575
7676
[source,shell]

0 commit comments

Comments
 (0)