From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 Apr 2009 05:32:51 +0000 (-0700)
Subject: Merge branch 'mh/html-path'
X-Git-Tag: v1.6.3-rc0~26
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d65279d5bf02f3c457a843c8586752714f42e75a?ds=inline;hp=-c

Merge branch 'mh/html-path'

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

d65279d5bf02f3c457a843c8586752714f42e75a
diff --combined contrib/completion/git-completion.bash
index d3d8203171,fdc5a24b27..c1c879821d
--- a/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
  			"