diff options
author | Sam Whited <sam@samwhited.com> | 2014-11-03 08:06:32 -0500 |
---|---|---|
committer | Sam Whited <sam@samwhited.com> | 2014-11-03 08:06:32 -0500 |
commit | f3401ab64f38754772b9c9c69485a6cc49af44b5 (patch) | |
tree | 5e3d2c67243b48e8da41353f022d1ecd9dd77b28 /README.md | |
parent | b54b1ca3b7a7101962d699d4b13c56593d23923b (diff) |
Fix some space/tab issues in README
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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): git remote add minidns https://github.com/rtreffer/minidns.git - git fetch minidns - git merge -s subtree minidns master + git fetch minidns + git merge -s subtree minidns master To add a new dependency to the `libs/` directory (replacing "name", "branch" and "url" as necessary): git remote add name url - git merge -s ours --no-commit name/branch - git read-tree --prefix=libs/name -u name/branch - git commit -m "Subtree merged in name" + git merge -s ours --no-commit name/branch + git read-tree --prefix=libs/name -u name/branch + git commit -m "Subtree merged in name" #### How do I debug Conversations |