git-help: add -w|--web option to display html man page in a browser.

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 39d1ef5298bd81868079b8d82ba56157e4785b5d..4124ad2970cfd76eb6592658c02007188c48003a 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -346,6 +346,13 @@ branch.<name>.mergeoptions::
        option values containing whitespace characters are currently not
        supported.
 
+branch.<name>.rebase::
+       When true, rebase the branch <name> on top of the fetched branch,
+       instead of merging the default branch from the default remote.
+       *NOTE*: this is a possibly dangerous operation; do *not* use
+       it unless you understand the implications (see gitlink:git-rebase[1]
+       for details).
+
 clean.requireForce::
        A boolean to make git-clean do nothing unless given -f
        or -n.   Defaults to true.