Skip to content

Commit 993549b

Browse files
committed
Merge pull request #491 from rpgoldman/git-tools-typo
Remove superfluous phrase.
2 parents 1b79c6d + 5b4d752 commit 993549b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

book/07-git-tools/sections/subtree-merges.asc

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

4-
The idea of the subtree merge is that you have two projects, and one of the projects maps to a subdirectory of the other one and vice versa.
4+
The idea of the subtree merge is that you have two projects, and one of the projects maps to a subdirectory of the other one.
55
When you specify a subtree merge, Git is often smart enough to figure out that one is a subtree of the other and merge appropriately.
66

77
We'll go through an example of adding a separate project into an existing project and then merging the code of the second into a subdirectory of the first.

0 commit comments

Comments
 (0)