My Various Git Projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b1f0a85 779a206)
Merge branch 'ik/gitweb-force-highlight'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Oct 2016 20:30:33 +0000 (13:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Oct 2016 20:30:34 +0000 (13:30 -0700)
commit347408496a08f18b49b3646b6bb20d17cce85632
tree81e9e190c83c0d33e5b0cf45bc0be561868a53e5tree | snapshot
parentb1f0a856605981363053941b8210f3cc9389607acommit | diff
parent779a20663230ab068dcbc3c5bc53d44a5e37b0aacommit | diff
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
The core git plumbing