X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/c5e8eb2b0e3a6f1174675f3611aa550457c60555..0771ac6f5eeaad1965fe7759aeb9a6544eab2adb:/README diff --git a/README b/README index ed7412549..7c5cd364d 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Copyright (C) 2010-2011, 2014 Free Software Foundation, Inc. +Copyright (C) 2010-2011, 2014, 2015 Free Software Foundation, Inc. See the end of the file for license conditions. @@ -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"). @@ -237,6 +237,7 @@ packages/ directory. You can then add that directory, e.g. with: ** To deploy the package repository as a remotely-accessible archive: git clone .../elpa + (cd elpa; git clone .../emacs) #If you want to generate :core packages. mkdir build cd build (cd ../elpa; git log --format=%H | tail -n 1) >.changelog-witness