Skip to content

Commit fe33bc3

Browse files
authored
Merge pull request #961 from td2014/master
Minor typo corrections.
2 parents 90bdf0a + 2e1fb6c commit fe33bc3

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

book/04-git-server/sections/generating-ssh-key.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
=== Generating Your SSH Public Key
33

44
(((SSH keys)))
5-
That being said, many Git servers authenticate using SSH public keys.
5+
Many Git servers authenticate using SSH public keys.
66
In order to provide a public key, each user in your system must generate one if they don't already have one.
77
This process is similar across all operating systems.
88
First, you should check to make sure you don't already have a key.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ The second command clones all the branches contained in the emacs repository; ne
6262
$ git config remote-bzr.branches 'trunk, xwindow'
6363
----
6464

65-
Some remote repositories don't allow to list their branches, in which case you have to manually specify them, and even though you could specify the configuration in the cloning command, you may find this easier:
65+
Some remote repositories don't allow you to list their branches, in which case you have to manually specify them, and even though you could specify the configuration in the cloning command, you may find this easier:
6666

6767
[source,console]
6868
----

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ Files:
481481

482482
This is mostly the same content you'd see by running `p4 submit`, except the stuff at the end which git-p4 has helpfully included.
483483
Git-p4 tries to honor your Git and Perforce settings individually when it has to provide a name for a commit or changeset, but in some cases you want to override it.
484-
For example, if the Git commit you're importing was written by a contributor who doesn't have a Perforce user account, you may still want the resulting changeset to look like they write it (and not you).
484+
For example, if the Git commit you're importing was written by a contributor who doesn't have a Perforce user account, you may still want the resulting changeset to look like they wrote it (and not you).
485485

486486
Git-p4 has helpfully imported the message from the Git commit as the content for this Perforce changeset, so all we have to do is save and quit, twice (once for each commit).
487487
The resulting shell output will look something like this:

0 commit comments

Comments
 (0)