Merge branch 'pb/prepare-commit-msg'

diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index 09904c75c40e5b44bb9ddd6458edc4cb89af5e35..fb77ca3a57d9377e8939c6d32601cf1386f0261b 100644 (file)
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -58,6 +58,16 @@ is available in PATH.
 +
 Note that the script tries, as much as possible, to display the HTML
 page in a new tab on an already opened browser.
++
+The following browsers are currently supported by 'git-help--browse':
++
+* firefox (this is the default under X Window when not using KDE)
+* iceweasel
+* konqueror (this is the default under KDE)
+* w3m (this is the default outside X Window)
+* links
+* lynx
+* dillo
 
 CONFIGURATION VARIABLES
 -----------------------