Skip to content

Commit 58fe079

Browse files
committed
fix branch name to distinguish from directory
1 parent fc3e65e commit 58fe079

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
@@ -48,7 +48,7 @@ This is sort of a strange concept. Not all the branches in your repository actua
4848
In this case, we want to pull the Rack project into our `master` project as a subdirectory.
4949
We can do that in Git with `git read-tree`.
5050
You’ll learn more about `read-tree` and its friends in <<_git_internals>>, but for now know that it reads the root tree of one branch into your current staging area and working directory.
51-
We just switched back to your `master` branch, and we pull the `rack` branch into the `rack` subdirectory of our `master` branch of our main project:
51+
We just switched back to your `master` branch, and we pull the `rack_branch` branch into the `rack` subdirectory of our `master` branch of our main project:
5252

5353
[source,console]
5454
----

0 commit comments

Comments
 (0)