From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Oct 2016 20:30:33 +0000 (-0700)
Subject: Merge branch 'ik/gitweb-force-highlight'
X-Git-Tag: v2.11.0-rc0~94
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=347408496a08f18b49b3646b6bb20d17cce85632;p=git.git

Merge branch 'ik/gitweb-force-highlight'

"gitweb" can spawn "highlight" to show blob contents with
(programming) language-specific syntax highlighting, but only
when the language is known.  "highlight" can however be told
to make the guess itself by giving it "--force" option, which
has been enabled.

* ik/gitweb-force-highlight:
  gitweb: use highlight's shebang detection
  gitweb: remove unused guess_file_syntax() parameter
---

347408496a08f18b49b3646b6bb20d17cce85632