Skip to content

Commit 1902461

Browse files
committed
Merge pull request #161 from zigarn/fixes
Some simple fixes
2 parents e38c4b5 + f41bb61 commit 1902461

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ $ git commit -am 'added DbConnector module'
118118
create mode 160000 DbConnector
119119
----
120120

121-
Notice the `160000` mode for the rack entry.
121+
Notice the `160000` mode for the `DbConnector` entry.
122122
That is a special mode in Git that basically means you’re recording a commit as a directory entry rather than a subdirectory or a file.
123123

124124
[[_cloning_submodules]]
@@ -208,7 +208,7 @@ If you want to check for new work in a submodule, you can go into the directory
208208
$ git fetch
209209
From https://github.com/chaconinc/DbConnector
210210
c3f01dc..d0354fc master -> origin/master
211-
Scotts-MacBook-Pro-3:DbConnector schacon$ git merge origin/master
211+
$ git merge origin/master
212212
Updating c3f01dc..d0354fc
213213
Fast-forward
214214
scripts/connect.sh | 1 +
@@ -774,7 +774,7 @@ Removing the directory isn't difficult, but it can be a bit confusing to have th
774774

775775
[source,console]
776776
----
777-
$ git clean -ffdx
777+
$ git clean -fdx
778778
Removing CryptoLibrary/
779779
780780
$ git checkout add-crypto

0 commit comments

Comments
 (0)