sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some space/tab issues in README

This commit is contained in:
Sam Whited 2014-11-03 08:06:32 -05:00
parent b54b1ca3b7
commit f3401ab64f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -281,16 +281,16 @@ in the `libs/` directory, you can update it using a subtree merge by doing the
following (using `minidns` as an example): following (using `minidns` as an example):
git remote add minidns https://github.com/rtreffer/minidns.git git remote add minidns https://github.com/rtreffer/minidns.git
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 (replacing "name", "branch" and To add a new dependency to the `libs/` directory (replacing "name", "branch" and
"url" as necessary): "url" as necessary):
git remote add name 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"
#### How do I debug Conversations #### How do I debug Conversations