diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-01-30 11:07:24 -0500 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-01-30 11:07:24 -0500 |
| commit | 76db9dec8132d4377f6c32e4d45eb75fa0cc7a9a (patch) | |
| tree | 80a6b54d21978b5c3879662bdc4f5951f804b808 /Documentation/howto/setup-git-server-over-http.txt | |
| parent | b715cfbba4083d25ec0d0f94e440ad734607ddb0 (diff) | |
| parent | 73a2acc0a09829f887fdf2dbcfba217102227932 (diff) | |
| download | git-76db9dec8132d4377f6c32e4d45eb75fa0cc7a9a.tar.gz | |
Merge branch 'master' into sp/gfi
git-fast-import requires use of inttypes.h, but the master branch has
added it to git-compat-util differently than git-fast-import originally
had used it. This merge back of master to the fast-import topic is to
get (and use) inttypes.h the way master is using it.
This is a partially evil merge to remove the call to setup_ident(),
as the master branch now contains a change which makes this implicit
and therefore removed the function declaration. (commit 01754769).
Conflicts:
git-compat-util.h
Diffstat (limited to 'Documentation/howto/setup-git-server-over-http.txt')
| -rw-r--r-- | Documentation/howto/setup-git-server-over-http.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/howto/setup-git-server-over-http.txt b/Documentation/howto/setup-git-server-over-http.txt index a202f3a460..8eadc20494 100644 --- a/Documentation/howto/setup-git-server-over-http.txt +++ b/Documentation/howto/setup-git-server-over-http.txt @@ -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: - $ 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 @@ -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 -defined with git-repo-config. +defined with git-config. Troubleshooting: |