diff options
author | Sam Whited <sam@samwhited.com> | 2014-10-28 12:31:28 -0400 |
---|---|---|
committer | Sam Whited <sam@samwhited.com> | 2014-10-28 12:31:28 -0400 |
commit | a362bd10214b16f8939c12a1dd4376667fe0d49f (patch) | |
tree | 5d1cb17fe239aad28192b5122833e5856c27c51c /README.md | |
parent | fdc10c794fc764296b9375b578585e4988c4ea1f (diff) |
Tweak README some more
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -284,9 +284,10 @@ following (using `minidns` as an example): git fetch minidns 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 read-tree --prefix=libs/name -u name/branch git commit -m "Subtree merged in name" |