Merge ../gitk

[git.git] / Documentation / howto / setup-git-server-over-http.txt

diff --git a/Documentation/howto/setup-git-server-over-http.txt b/Documentation/howto/setup-git-server-over-http.txt
index ba191569af9501117322e1881160226a74867007..8eadc2049402cc21fd80818ca9f29d15f4cd8462 100644 (file)
--- a/Documentation/howto/setup-git-server-over-http.txt
+++ b/Documentation/howto/setup-git-server-over-http.txt
@@ -70,7 +70,7 @@ DocumentRoot /where/ever/httpd.conf" to find your root:
 Initialize a bare repository
 
     $ cd my-new-repo.git
 Initialize a bare repository
 
     $ cd my-new-repo.git

-    $ git --bare init-db
+    $ git --bare init

 
 
 Change the ownership to your web-server's credentials. Use "grep ^User
 
 
 Change the ownership to your web-server's credentials. Use "grep ^User


@@ -205,7 +205,7 @@ To check whether all is OK, do:
 Now, add the remote in your existing repository which contains the project
 you want to export:
 
 Now, add the remote in your existing repository which contains the project
 you want to export:
 

-   $ git-repo-config remote.upload.url \
+   $ git-config remote.upload.url \

        http://<username>@<servername>/my-new-repo.git/
 
 It is important to put the last '/'; Without it, the server will send
        http://<username>@<servername>/my-new-repo.git/
 
 It is important to put the last '/'; Without it, the server will send


@@ -222,7 +222,7 @@ From your client repository, do
 
 This pushes branch 'master' (which is assumed to be the branch you
 want to export) to repository called 'upload', which we previously
 
 This pushes branch 'master' (which is assumed to be the branch you
 want to export) to repository called 'upload', which we previously

-defined with git-repo-config.
+defined with git-config.

 
 
 Troubleshooting:
 
 
 Troubleshooting: