From: Artur Malabarba Date: Sun, 8 Nov 2015 13:03:22 +0000 (+0000) Subject: * README: Typos X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/d5445c4fb3751b89d9840bd61cbf2eab31fefd37 * README: Typos --- diff --git a/README b/README index ed7412549..b3e2b7bdf 100644 --- a/README +++ b/README @@ -145,7 +145,7 @@ upstream every once in a while. This copy may include local changes, although these should be kept to a minimum. If know you don't want a local package, but don't know which of these -two options you prefere, then use a subtree. +two options you prefer, then use a subtree. *** Subtrees @@ -169,7 +169,7 @@ them here, simply do: On older git versions "git subtree" might not be available. You can try "git merge -s subtree", or just update git. -- is the remote's url. If you've previously used "git +- is the remote's URL. If you've previously used "git remote add", then this can be the remote's name. - is the branch you want to pull (probably "master").