Skip to content

Commit 0f3647f

Browse files
committed
Copy-writing feedback
1 parent ab99016 commit 0f3647f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
(((Perforce)))
55
Perforce is a very popular version-control system in corporate environments.
66
It's been around since 1995, which makes it the oldest system covered in this chapter.
7-
As such, it's designed with the constraints of its day; it assumes you're always be connected to a single central server, and only one version is kept on the local disk.
7+
As such, it's designed with the constraints of its day; it assumes you're always connected to a single central server, and only one version is kept on the local disk.
88
To be sure, its features and constraints are well-suited to several specific problems, but there are lots of projects using Perforce where Git would actually work better.
99

1010
There are two options if you'd like to mix your use of Perforce and Git.
@@ -22,7 +22,7 @@ Perforce provides a product called Git Fusion (available at http://www.perforce.
2222
For our examples, we'll be using the easiest installation method for Git Fusion, which is downloading a virtual machine that runs the Perforce daemon and Git Fusion.
2323
You can get the virtual machine image from http://www.perforce.com/downloads/Perforce/20-User[], and once it's finished downloading, import it into your favorite virtualization software (we'll use VirtualBox).
2424

25-
Upon first starting the machine, it asks you to customize several the password for three Linux users (`root`, `perforce`, and `git`), and provide an instance name, which can be used to distinguish this installation from others on the same network. When that has all completed, you'll see this:
25+
Upon first starting the machine, it asks you to customize the password for three Linux users (`root`, `perforce`, and `git`), and provide an instance name, which can be used to distinguish this installation from others on the same network. When that has all completed, you'll see this:
2626

2727
.The Git Fusion virtual machine boot screen.
2828
image::images/git-fusion-boot.png[The Git Fusion virtual machine boot screen.]
@@ -349,7 +349,7 @@ Doing initial import of //depot/www/live/ from revision #head into refs/remotes/
349349
----
350350

351351
This creates what in Git terms is a ``shallow'' clone; only the very latest Perforce revision is imported into Git; remember, Perforce isn't designed to give every revision to every user.
352-
This is enough to use Git as a Perforce client, but for other purposes it's not enough; see <<_shallow>> for more on this topic.
352+
This is enough to use Git as a Perforce client, but for other purposes it's not enough.
353353

354354
Once it's finished, we have a fully-functional Git repository:
355355

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ $ git log --all --oneline --decorate
5656
512e75a (HEAD, tag: TFS_C35190, origin_tfs/tfs, master) Checkin message
5757
----
5858

59-
This is called a _shallow_ clone, meaning that only the latest changeset has been downloaded (see <<_shallow>> for more on shallow clones).
59+
This is called a _shallow_ clone, meaning that only the latest changeset has been downloaded.
6060
TFVC isn't designed for each client to have a full copy of the history, so git-tf defaults to only getting the latest version, which is much faster.
6161

6262
If you have some time, it's probably worth it to clone the entire project history, using the `--deep` option:

0 commit comments

Comments
 (0)