moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-27 19:22:15 -05:00
Code Issues Releases Wiki Activity

Tweak README some more

Browse Source
This commit is contained in:
Sam Whited 2014-10-28 12:31:28 -04:00
parent fdc10c794f
commit a362bd1021
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -284,9 +284,10 @@ following (using `minidns` as an example):
git fetch minidns git fetch minidns
git merge -s subtree minidns master git merge -s subtree minidns master
To add a new dependency to the `libs/` directory: To add a new dependency to the `libs/` directory (replacing "name", "branch" and
"url" as necessary):
git remote add name repo-url git remote add name url
git merge -s ours --no-commit name/branch git merge -s ours --no-commit name/branch
git read-tree --prefix=libs/name -u name/branch git read-tree --prefix=libs/name -u name/branch
git commit -m "Subtree merged in name" git commit -m "Subtree merged in name"