Skip to content

Commit 13469c7

Browse files
committed
Merge pull request progit#289 from robblanco/its-typos
A few it's -> its grammar fixes
2 parents aa3b63c + 5b1e03f commit 13469c7

File tree

8 files changed

+12
-12
lines changed

8 files changed

+12
-12
lines changed

book/06-github/sections/3-maintaining.asc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ Web notifications only exist on GitHub and you can only check them on GitHub. If
245245
.Notification center.
246246
image::images/maint-08-notifications-page.png[Notification center]
247247

248-
If you click on that, you will see a list of all the items you have been notified about, grouped by project. You can filter to the notifications of a specific project by clicking on it's name in the left hand sidebar. You can also acknowledge the notification by clicking the checkmark icon next to any notification, or acknowledge _all_ of the notifications in a project by clicking the checkmark at the top of the group. There is also a mute button next to each checkmark that you can click to not receive any further notifications on that item.
248+
If you click on that, you will see a list of all the items you have been notified about, grouped by project. You can filter to the notifications of a specific project by clicking on its name in the left hand sidebar. You can also acknowledge the notification by clicking the checkmark icon next to any notification, or acknowledge _all_ of the notifications in a project by clicking the checkmark at the top of the group. There is also a mute button next to each checkmark that you can click to not receive any further notifications on that item.
249249

250250
All of these tools are very useful for handling large numbers of notifications. Many GitHub power users will simply turn off email notifications entirely and manage all of their notifications through this screen.
251251

@@ -328,4 +328,4 @@ image::images/maint-11-transfer.png[Transfer]
328328

329329
This is helpful if you are abandoning a project and someone wants to take it over, or if your project is getting bigger and want to move it into an organization.
330330

331-
Not only does this move the repository along with all it's watchers and stars to another place, it also sets up a redirect from your URL to the new place. It will also redirect clones and fetches from Git, not just web requests.
331+
Not only does this move the repository along with all its watchers and stars to another place, it also sets up a redirect from your URL to the new place. It will also redirect clones and fetches from Git, not just web requests.

book/06-github/sections/5-scripting.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
So now we've covered all of the major features and workflows of GitHub, but any large group or project will have customizations they may want to make or external services they may want to integrate.
44

5-
Luckily for us, GitHub is really quite hackable in many ways. In this section we'll cover how to use the GitHub hooks system and it's API to make GitHub work how we want it to.
5+
Luckily for us, GitHub is really quite hackable in many ways. In this section we'll cover how to use the GitHub hooks system and its API to make GitHub work how we want it to.
66

77
==== Hooks
88

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

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

44
Though we've covered the common ways to transfer Git data over a network (HTTP, SSH, etc), there is actually one more way to do so that is not commonly used but can actually be quite useful.
55

6-
Git is capable of ``bundling'' it's data into a single file. This can be useful in various scenarios. Maybe your network is down and you want to send changes to your co-workers. Perhaps you're working somewhere offsite and don't have access to the local network for security reasons. Maybe your wireless/ethernet card just broke. Maybe you don't have access to a shared server for the moment, you want to email someone updates and you don't want to transfer 40 commits via `format-patch`.
6+
Git is capable of ``bundling'' its data into a single file. This can be useful in various scenarios. Maybe your network is down and you want to send changes to your co-workers. Perhaps you're working somewhere offsite and don't have access to the local network for security reasons. Maybe your wireless/ethernet card just broke. Maybe you don't have access to a shared server for the moment, you want to email someone updates and you don't want to transfer 40 commits via `format-patch`.
77

88
This is where the `git bundle` command can be helpful. The `bundle` command will package up everything that would normally be pushed over the wire with a `git push` command into a binary file that you can email to someone or put on a flash drive, then unbundle into another repository.
99

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[[_replace]]
22
=== Replace
33

4-
Git's objects are unchangeable, but it does provide an interesting way to pretend to replace objects in it's database with other objects.
4+
Git's objects are unchangeable, but it does provide an interesting way to pretend to replace objects in its database with other objects.
55

66
The `replace` command lets you specify an object in Git and say "every time you see this, pretend it's this other thing". This is most commonly useful for replacing one commit in your history with another one.
77

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ Date: Wed Jun 4 19:49:17 2014 -0700
142142
signed commit
143143
----
144144

145-
Additionally, you can configure `git log` to check any signatures it finds and list them in it's output with the `%G?` format.
145+
Additionally, you can configure `git log` to check any signatures it finds and list them in its output with the `%G?` format.
146146

147147
[source,console]
148148
----

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ $ git commit -m "Merge Tom's Changes" <5>
608608
It can be a bit confusing, but it's really not very hard.
609609

610610
Interestingly, there is another case that Git handles.
611-
If a merge commit exists in the submodule directory that contains **both** commits in it's history, Git will suggest it to you as a possible solution. It sees that at some point in the submodule project, someone merged branches containing these two commits, so maybe you'll want that one.
611+
If a merge commit exists in the submodule directory that contains **both** commits in its history, Git will suggest it to you as a possible solution. It sees that at some point in the submodule project, someone merged branches containing these two commits, so maybe you'll want that one.
612612

613613
This is why the error message from before was ``merge following commits not found'', because it could not do *this*. It's confusing because who would expect it to **try** to do this?
614614

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,5 +408,5 @@ If you want to work on the newly-minted branch, you'll want to base your new com
408408

409409
Git-tf and Git-tfs are both great tools for interfacing with a TFVC server.
410410
They allow you to use the power of Git locally, avoid constantly having to round-trip to the central TFVC server, and make your life as a developer much easier, without forcing your entire team to migrate to Git.
411-
If you're working on Windows (which is likely if your team is using TFS), you'll probably want to use git-tfs, since it's feature set is more complete, but if you're working on another platform, you'll be using git-tf, which is more limited.
411+
If you're working on Windows (which is likely if your team is using TFS), you'll probably want to use git-tfs, since its feature set is more complete, but if you're working on another platform, you'll be using git-tf, which is more limited.
412412
As with most of the tools in this chapter, you should choose one of these version-control systems to be canonical, and use the other one in a subordinate fashion – either Git or TFVC should be the center of collaboration, but not both.

book/C-git-commands/1-git-commands.asc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ Finally, we emulate it at a low level in <<_tree_objects>>, so you can get an id
8888

8989
==== git status
9090

91-
The `git status` command will show you the different states of files in your working directory and staging area. Which files are modified and unstaged and which are staged but not yet committed. In it's normal form, it also will show you some basic hints on how to move files between these stages.
91+
The `git status` command will show you the different states of files in your working directory and staging area. Which files are modified and unstaged and which are staged but not yet committed. In its normal form, it also will show you some basic hints on how to move files between these stages.
9292

93-
We first cover `status` in <<_checking_status>>, both in it's basic and simplified forms. While we use it throughout the book, pretty much everything you can do with the `git status` command is covered there.
93+
We first cover `status` in <<_checking_status>>, both in its basic and simplified forms. While we use it throughout the book, pretty much everything you can do with the `git status` command is covered there.
9494

9595
==== git diff
9696

@@ -164,7 +164,7 @@ There are just a handful of commands that implement most of the branching and me
164164

165165
The `git branch` command is actually something of a branch management tool. It can list the branches you have, create a new branch, delete branches and rename branches.
166166

167-
Most of <<_git_branching>> is dedicated to the `branch` command and it's used throughout the entire chapter. We first introduce it in <<_create_new_branch>> and we go through most of it's other features (listing and deleting) in <<_branch_management>>.
167+
Most of <<_git_branching>> is dedicated to the `branch` command and it's used throughout the entire chapter. We first introduce it in <<_create_new_branch>> and we go through most of its other features (listing and deleting) in <<_branch_management>>.
168168

169169
In <<_tracking_branches>> we use the `git branch -u` option to set up a tracking branch.
170170

@@ -180,7 +180,7 @@ We see how to use it to start tracking branches with the `--track` flag in <<_tr
180180

181181
We use it to reintroduce file conflicts with `--conflict=diff3` in <<_checking_out_conflicts>>.
182182

183-
We go into closer detail on it's relationship with `git reset` in <<_git_reset>>.
183+
We go into closer detail on its relationship with `git reset` in <<_git_reset>>.
184184

185185
Finally, we go into some implementation detail in <<_the_head>>.
186186

0 commit comments

Comments
 (0)