Fix typo in subtree merge directions

2014-10-28 12:26:41 -04:00 · 2014-10-28 12:26:41 -04:00 · fdc10c794f
commit fdc10c794f
parent f7f4c79419
1 changed files with 1 additions and 1 deletions
--- 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: