From f3401ab64f38754772b9c9c69485a6cc49af44b5 Mon Sep 17 00:00:00 2001 From: Sam Whited Date: Mon, 3 Nov 2014 08:06:32 -0500 Subject: [PATCH] Fix some space/tab issues in README --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ed8a48af3..9dd4b378d 100644 --- a/README.md +++ b/README.md @@ -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