aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Whited <sam@samwhited.com>2014-10-28 12:26:41 -0400
committerSam Whited <sam@samwhited.com>2014-10-28 12:26:41 -0400
commitfdc10c794fc764296b9375b578585e4988c4ea1f (patch)
tree091a0b949ba1b99342198343a5cbf3f501a1f7d8
parentf7f4c794195b733b8de1c5307eacc785f5cc00f5 (diff)
Fix typo in subtree merge directions
-rw-r--r--README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.md b/README.md
index c7e242ee5..fbc8d2dcf 100644
--- a/README.md
+++ b/README.md
@@ -282,7 +282,7 @@ following (using `minidns` as an example):
git remote add minidns https://github.com/rtreffer/minidns.git
git fetch minidns
- git merge -s minidns/master
+ git merge -s subtree minidns master
To add a new dependency to the `libs/` directory: