Merge branch 'mh/html-path'

* mh/html-path:
add --html-path to get the location of installed HTML docs

diff --combined contrib/completion/git-completion.bash
index d3d8203171a3c7c221399dd6d79c8429c5006bcc,fdc5a24b27c4df13d44d98da1dbbd4ade1178589..c1c879821dc5c6314346d8c55c79fafdf48b5ac1
--- 1/contrib/completion/git-completion.bash
--- 2/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -646,8 -646,7 +646,8 @@@ _git_am (
                ;;
        --*)
                __gitcomp "
 -                      --signoff --utf8 --binary --3way --interactive
 +                      --3way --committer-date-is-author-date --ignore-date
 +                      --interactive --keep --no-utf8 --signoff --utf8
                        --whitespace=
                        "
                return
@@@ -1871,6 -1870,7 +1871,7 @@@ _git (
                        --bare
                        --version
                        --exec-path
+                       --html-path
                        --work-tree=
                        --help
                        "