aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSitaram Chamarty <sitaram@atc.tcs.com>2010-02-26 07:29:13 +0530
committerSitaram Chamarty <sitaram@atc.tcs.com>2010-02-26 07:29:18 +0530
commitde74e8d34352c586b27fb68a14a0cd58ae2e1e8e (patch)
tree957f10e33882f33ab1b0cd7d4faa7ddf6f9ae1a0
parentMerge branch 'dps' into master (diff)
parenteasy install: be more specific about NOT adding repos manually (diff)
downloadgitolite-gentoo-de74e8d34352c586b27fb68a14a0cd58ae2e1e8e.tar.gz
gitolite-gentoo-de74e8d34352c586b27fb68a14a0cd58ae2e1e8e.tar.bz2
gitolite-gentoo-de74e8d34352c586b27fb68a14a0cd58ae2e1e8e.zip
Merge branch 'master' into pu (damn!)v1.2
stupid me; committed the easy install patch on master *and* pushed, instead of on pu... Since I dont want to rewind master, we end up with this completely unnecessary merge.
-rwxr-xr-xsrc/gl-easy-install7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gl-easy-install b/src/gl-easy-install
index 989f3a6..05dd5dc 100755
--- a/src/gl-easy-install
+++ b/src/gl-easy-install
@@ -582,7 +582,7 @@ it elsewhere later if you wish to.
"
tail="
-NOTE: All the below stuff is on your *workstation*. You shoud not, normally,
+NOTE: All the below stuff is on your *workstation*. You should not, normally,
have to do anything directly on your server to administer/use gitolite.
The admin repo is currently cloned at ~/gitolite-admin. You can reclone it
@@ -590,8 +590,9 @@ anywhere else if you wish. To administer gitolite, make changes to the config
file (conf/gitolite.conf) and/or the pubkeys (in subdirectory 'keydir') in any
clone, then git add, git commit, and git push.
-ADDING REPOS: Edit the config file to give *some* user access to the repo.
-When you push, an empty repo will be created on the server.
+ADDING REPOS: Do NOT add repos manually on the server. Edit the config file
+to give *some* user access to the repo. When you push, an empty repo will be
+created on the server.
ADDING USERS: copy their pubkey as keydir/<username>.pub, add it, commit and
push.