summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-12 21:49:53 -0800
committerJunio C Hamano <gitster@pobox.com>2010-12-12 21:49:53 -0800
commit52cb57324a5d826082cc945896b47c7a783321c0 (patch)
tree73fe30a49ed0710604c9698c1d4a5a577f385d5a /Documentation
parent6e67619d0cdc175557ca633dec391d4e795cf965 (diff)
parent14ea67c0071804b7eb73cca35c87860f8fc6db95 (diff)
downloadgit-52cb57324a5d826082cc945896b47c7a783321c0.tar.gz
Merge branch 'gb/web--browse'
* gb/web--browse: web--browse: better support for chromium web--browse: support opera, seamonkey and elinks web--browse: split valid_tool list web--browse: coding style
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-web--browse.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt
index 51e8e0af1e..c0416e5e1a 100644
--- a/Documentation/git-web--browse.txt
+++ b/Documentation/git-web--browse.txt
@@ -20,8 +20,14 @@ The following browsers (or commands) are currently supported:
* firefox (this is the default under X Window when not using KDE)
* iceweasel
+* seamonkey
+* iceape
+* chromium (also supported as chromium-browser)
+* google-chrome (also supported as chrome)
* konqueror (this is the default under KDE, see 'Note about konqueror' below)
+* opera
* w3m (this is the default outside graphical environments)
+* elinks
* links
* lynx
* dillo