summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Christian Couder <chriscool@tuxfamily.org>2008-04-25 08:25:41 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-04-26 14:34:49 -0700
commitac3a4a2694fa8bea477b1a265efd6829de686e5c (patch)
treef74785016bd40a1c6341366e3a0c3d93c7f001d9 /Documentation
parentdocumentation: help: add info about "man.<tool>.cmd" config var (diff)
downloadtgif-ac3a4a2694fa8bea477b1a265efd6829de686e5c.tar.xz
documentation: web--browse: add a note about konqueror
This note explains how to work around the fact that we try to use kfmclient to launch konqueror. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-web--browse.txt24
1 files changed, 23 insertions, 1 deletions
diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt
index ddbae5b194..92ef574565 100644
--- a/Documentation/git-web--browse.txt
+++ b/Documentation/git-web--browse.txt
@@ -20,7 +20,7 @@ The following browsers (or commands) are currently supported:
* firefox (this is the default under X Window when not using KDE)
* iceweasel
-* konqueror (this is the default under KDE)
+* konqueror (this is the default under KDE, see 'Note about konqueror' below)
* w3m (this is the default outside graphical environments)
* links
* lynx
@@ -71,6 +71,28 @@ variable exists then "git web--browse" will treat the specified tool
as a custom command and will use a shell eval to run the command with
the URLs passed as arguments.
+Note about konqueror
+--------------------
+
+When 'konqueror' is specified by the a command line option or a
+configuration variable, we launch 'kfmclient' to try to open the HTML
+man page on an already opened konqueror in a new tab if possible.
+
+For consistency, we also try such a trick if 'brower.konqueror.path' is
+set to something like 'A_PATH_TO/konqueror'. That means we will try to
+launch 'A_PATH_TO/kfmclient' instead.
+
+If you really want to use 'konqueror', then you can use something like
+the following:
+
+------------------------------------------------
+ [web]
+ browser = konq
+
+ [browser "konq"]
+ cmd = A_PATH_TO/konqueror
+------------------------------------------------
+
Note about git config --global
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~