threads / patch / 11520

patchDocumentation: config: add 'help.*' and 'instaweb.*' variables.

Subject: [PATCH] Documentation: config: add 'help.*' and 'instaweb.*' variables.

## tl;dr

5 messages between Jan 8, 2008 and Jan 8, 2008. Diffs are folded; open one to read it.

replies: 4people: 3as markdown or json

Christian Couder· Jan 8, 2008, 03:55 UTC · lore
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 Documentation/config.txt |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)
Show changes to Documentation/config.txt +33 −0
diff --git a/Documentation/config.txt b/Documentation/config.txt
index e1eaee9..c9895dc 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -585,6 +585,15 @@ specified as 'gitcvs.<access_method>.<varname>' (where 'access_method'
 is one of "ext" and "pserver") to make them apply only for the given
 access method.
 
+help.browser::
+	Specify the browser that will be used to display help in the
+	'web' format. See gitlink:git-help[1].
+
+help.format::
+	Override the default help format used by gitlink:git-help[1].
+	Values 'man', 'info', 'web' and 'html' are supported. 'man' is
+	the default. 'web' and 'html' are the same.
+
 http.proxy::
 	Override the HTTP proxy, normally configured using the 'http_proxy'
 	environment variable (see gitlink:curl[1]).  This can be overridden
@@ -642,6 +651,25 @@ i18n.logOutputEncoding::
 	Character encoding the commit messages are converted to when
 	running `git-log` and friends.
 
+instaweb.browser::
+	Specify the program that will be used to browse your working
+	repository in gitweb. See gitlink:git-instaweb[1].
+
+instaweb.httpd::
+	The HTTP daemon command-line to start gitweb on your working
+	repository. See gitlink:git-instaweb[1].
+
+instaweb.local::
+	If true the web server started by gitlink:git-instaweb[1] will
+	be bound to the local IP (127.0.0.1).
+
+instaweb.modulepath::
+	The module path for an apache httpd used by gitlink:git-instaweb[1].
+
+instaweb.port::
+	The port number to bind the gitweb httpd to. See
+	gitlink:git-instaweb[1].
+
 log.showroot::
 	If true, the initial commit will be shown as a big creation event.
 	This is equivalent to a diff against an empty tree.
@@ -843,4 +871,8 @@ receive.denyNonFastForwards::
 transfer.unpackLimit::
 	When `fetch.unpackLimit` or `receive.unpackLimit` are
 	not set, the value of this variable is used instead.
+
+web.browser::
+	Specify a web browser that may be used by some commands.
+	Currently only gitlink:git-instaweb[1] and gitlink:git-help[1]
+	may use it.

-- 
1.5.4.rc2.38.gd6da3
Junio C Hamano· Jan 8, 2008, 06:27 UTC · re: Christian Couder · lore

Re: [PATCH] Documentation: config: add 'help.*' and 'instaweb.*' variables.

Christian Couder <chriscool@tuxfamily.org> writes:
> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>

Thanks. I already had Dan's s/gitlink/linkgit/ patch in my tree to work aroudn AscciDoc issues but adjusting the patch was trivial.

Show 11 quoted lines
> @@ -843,4 +871,8 @@ receive.denyNonFastForwards::
>  transfer.unpackLimit::
>  	When `fetch.unpackLimit` or `receive.unpackLimit` are
>  	not set, the value of this variable is used instead.
> +
> +web.browser::
> +	Specify a web browser that may be used by some commands.
> +	Currently only gitlink:git-instaweb[1] and gitlink:git-help[1]
> +	may use it.
> -- 
> 1.5.4.rc2.38.gd6da3

Somebody seems to have recounted the patch lines incorrectly here. The hunk header should have read "@@ -843,3 +871,8 @@".

Christian Couder· Jan 8, 2008, 07:43 UTC · re: Junio C Hamano · lore

Re: [PATCH] Documentation: config: add 'help.*' and 'instaweb.*' variables.

Le mardi 8 janvier 2008, Junio C Hamano a écrit :
Show 10 quoted lines
> Christian Couder <chriscool@tuxfamily.org> writes:
> > +web.browser::
> > +	Specify a web browser that may be used by some commands.
> > +	Currently only gitlink:git-instaweb[1] and gitlink:git-help[1]
> > +	may use it.
> > --
> > 1.5.4.rc2.38.gd6da3
>
> Somebody seems to have recounted the patch lines incorrectly
> here.  The hunk header should have read "@@ -843,3 +871,8 @@".

Yeah, sorry about that. I added "gitlink:" before "git-help[1]" and moved "may use" to the next line before "it" just before sending the patch. This probably made xemacs recount badly.

By the way I had no comment on my RFC/Patch to run the test scripts under valgrind. Maybe it's useless because it doesn't find any bug right now.

Thanks, Christian.

Junio C Hamano· Jan 8, 2008, 07:40 UTC · re: Christian Couder · lore

Re: [PATCH] Documentation: config: add 'help.*' and 'instaweb.*' variables.

Christian Couder <chriscool@tuxfamily.org> writes:
> By the way I had no comment on my RFC/Patch to run the test scripts under 
> valgrind. Maybe it's useless because it doesn't find any bug right now.

I found it interesting myself. I did not know how well it fits into the rest of the testing infrastructure, though. Perhaps you would want to reopen the issue after 1.5.4?

Johannes Schindelin· Jan 8, 2008, 10:32 UTC · re: Junio C Hamano · lore

Re: [PATCH] Documentation: config: add 'help.*' and 'instaweb.*' variables.

Hi,
On Mon, 7 Jan 2008, Junio C Hamano wrote:
Show 9 quoted lines
> Christian Couder <chriscool@tuxfamily.org> writes:
> 
> > By the way I had no comment on my RFC/Patch to run the test scripts 
> > under valgrind. Maybe it's useless because it doesn't find any bug 
> > right now.
> 
> I found it interesting myself.  I did not know how well it fits into the 
> rest of the testing infrastructure, though.  Perhaps you would want to 
> reopen the issue after 1.5.4?

I meant to rewrite it as a patch to test-lib.sh, because I found the use of perl not necessary. Besides, I would like to integrate it better, i.e. "make USE_VALGRIND=yes" or "make USE_VALGRIND=t1501:2".

Ciao, Dscho

← back to recent threads