Merge branch 'ik/gitweb-force-highlight'
commit347408496a08f18b49b3646b6bb20d17cce85632
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Oct 2016 20:30:33 +0000 (3 13:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Oct 2016 20:30:34 +0000 (3 13:30 -0700)
tree81e9e190c83c0d33e5b0cf45bc0be561868a53e5
parentb1f0a856605981363053941b8210f3cc9389607a
parent779a20663230ab068dcbc3c5bc53d44a5e37b0aa
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