Skip to content

Commit 8d6a79d

Browse files
committed
Merge pull request progit#213 from rdwampler/avoid-singular-pronouns
Avoid first-person singular pronouns where appropriate
2 parents 1f207f3 + 0ee6dac commit 8d6a79d

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

book/02-git-basics/sections/remotes.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Notice that these remotes use a variety of protocols; we'll cover more about thi
6262

6363
==== Adding Remote Repositories
6464

65-
I've mentioned and given some demonstrations of adding remote repositories in previous sections, but here is how to do it explicitly.(((git commands, remote)))
65+
We've mentioned and given some demonstrations of adding remote repositories in previous sections, but here is how to do it explicitly.(((git commands, remote)))
6666
To add a new remote Git repository as a shortname you can reference easily, run `git remote add [shortname] [url]`:
6767

6868
[source,console]

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

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

105105
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.
106106

107-
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.
107+
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 us every change that was made to the function as a series of patches back to when the function was first created.
108108

109109
[source,console]
110110
----

book/08-customizing-git/sections/attributes.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ index 0b013ca..ba25db5 100644
105105
Many people's version-control method of choice is to copy files into another directory (perhaps a time-stamped directory, if they're clever). This approach is very common because it is so simple, but it is also incredibly error prone. It is easy to forget which directory you're in and accidentally write to the wrong file or copy over files you don't mean to.
106106
----
107107

108-
Git successfully and succinctly tells me that I added the string ``Testing: 1, 2, 3.'', which is correct.
108+
Git successfully and succinctly tells us that we added the string ``Testing: 1, 2, 3.'', which is correct.
109109
It's not perfect – formatting changes wouldn't show up here – but it certainly works.
110110

111111
Another interesting problem you can solve this way involves diffing image files.

book/08-customizing-git/sections/config.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,11 +235,11 @@ You can also set up a graphical merge-conflict-resolution tool instead of having
235235
We'll demonstrate setting up the Perforce Visual Merge Tool (P4Merge) to do your diffs and merge resolutions, because it's a nice graphical tool and it's free.
236236

237237
If you want to try this out, P4Merge works on all major platforms, so you should be able to do so.
238-
I'll use path names in the examples that work on Mac and Linux systems; for Windows, you'll have to change `/usr/local/bin` to an executable path in your environment.
238+
We'll use path names in the examples that work on Mac and Linux systems; for Windows, you'll have to change `/usr/local/bin` to an executable path in your environment.
239239

240240
To begin, download P4Merge from http://www.perforce.com/downloads/Perforce/[].
241241
Next, you'll set up external wrapper scripts to run your commands.
242-
I'll use the Mac path for the executable; in other systems, it will be where your `p4merge` binary is installed.
242+
We'll use the Mac path for the executable; in other systems, it will be where your `p4merge` binary is installed.
243243
Set up a merge wrapper script named `extMerge` that calls your binary with all the arguments provided:
244244

245245
[source,console]

book/08-customizing-git/sections/hooks.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ If you want to use the bundled hook scripts, you'll have to rename them; their f
1717

1818
To enable a hook script, put a file in the `hooks` subdirectory of your Git directory that is named appropriately and is executable.
1919
From that point forward, it should be called.
20-
I'll cover most of the major hook filenames here.
20+
We'll cover most of the major hook filenames here.
2121

2222
==== Client-Side Hooks
2323

@@ -47,7 +47,7 @@ You may use it in conjunction with a commit template to programmatically insert
4747

4848
The `commit-msg` hook takes one parameter, which again is the path to a temporary file that contains the commit message written by the developer.
4949
If this script exits non-zero, Git aborts the commit process, so you can use it to validate your project state or commit message before allowing a commit to go through.
50-
In the last section of this chapter, I'll demonstrate using this hook to check that your commit message is conformant to a required pattern.
50+
In the last section of this chapter, We'll demonstrate using this hook to check that your commit message is conformant to a required pattern.
5151

5252
After the entire commit process is completed, the `post-commit` hook runs.
5353
It doesn't take any parameters, but you can easily get the last commit by running `git log -1 HEAD`.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ You'll learn more about what this means in a bit.
1313
In the early days of Git (mostly pre 1.5), the user interface was much more complex because it emphasized this filesystem rather than a polished VCS.
1414
In the last few years, the UI has been refined until it's as clean and easy to use as any system out there; but often, the stereotype lingers about the early Git UI that was complex and difficult to learn.
1515

16-
The content-addressable filesystem layer is amazingly cool, so I'll cover that first in this chapter; then, you'll learn about the transport mechanisms and the repository maintenance tasks that you may eventually have to deal with.
16+
The content-addressable filesystem layer is amazingly cool, so we'll cover that first in this chapter; then, you'll learn about the transport mechanisms and the repository maintenance tasks that you may eventually have to deal with.
1717

1818
include::sections/plumbing-porcelain.asc[]
1919

book/introduction.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ plunge.
5050
about Git and can wield it with power and grace, you can move on to discuss how Git stores its objects,
5151
what the object model is, details of packfiles, server protocols, and more. Throughout the book,
5252
we will refer to sections of this chapter in case you feel like diving deep at that point;
53-
but if you are like me and want to dive into the technical details, you may want to read Chapter 10 first.
53+
but if you are like us and want to dive into the technical details, you may want to read Chapter 10 first.
5454
We leave that up to you.
5555

5656
In *Appendix A* we look at a number of examples of using Git in various specific environments. We cover

0 commit comments

Comments
 (0)