Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion book/04-git-server/sections/gitweb.asc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ $ git instaweb --httpd=webrick --stop

If you want to run the web interface on a server all the time for your team or for an open source project you're hosting, you'll need to set up the CGI script to be served by your normal web server.
Some Linux distributions have a `gitweb` package that you may be able to install via `apt` or `yum`, so you may want to try that first.
We'll walk though installing GitWeb manually very quickly.
We'll walk through installing GitWeb manually very quickly.
First, you need to get the Git source code, which GitWeb comes with, and generate the custom CGI script:

[source,console]
Expand Down
2 changes: 1 addition & 1 deletion book/04-git-server/sections/smart-http.asc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Setting up Smart HTTP is basically just enabling a CGI script that is provided w
This CGI will read the path and headers sent by a `git fetch` or `git push` to an HTTP URL and determine if the client can communicate over HTTP (which is true for any client since version 1.6.6).
If the CGI sees that the client is smart, it will communicate smartly with it, otherwise it will fall back to the dumb behavior (so it is backward compatible for reads with older clients).

Let's walk though a very basic setup. We'll set this up with Apache as the CGI server. If you don't have Apache setup, you can do so on a Linux box with something like this:(((Apache)))
Let's walk through a very basic setup. We'll set this up with Apache as the CGI server. If you don't have Apache setup, you can do so on a Linux box with something like this:(((Apache)))

[source,console]
----
Expand Down
2 changes: 1 addition & 1 deletion book/07-git-tools/sections/submodules.asc
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ Now we have a copy of a project with submodules in it and will collaborate with

===== Pulling in Upstream Changes

The simplest model of using submodules in a project would be if you were simply consuming a subproject and wanted to get updates from it from time to time but were not actually modifying anything in your checkout. Let's walk though a simple example there.
The simplest model of using submodules in a project would be if you were simply consuming a subproject and wanted to get updates from it from time to time but were not actually modifying anything in your checkout. Let's walk through a simple example there.

If you want to check for new work in a submodule, you can go into the directory and run `git fetch` and `git merge` the upstream branch to update the local code.

Expand Down