diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-10-03 13:30:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-03 13:30:34 -0700 |
| commit | 347408496a08f18b49b3646b6bb20d17cce85632 (patch) | |
| tree | 81e9e190c83c0d33e5b0cf45bc0be561868a53e5 /Documentation/git-mergetool--lib.txt | |
| parent | Merge branch 'rs/copy-array' (diff) | |
| parent | gitweb: use highlight's shebang detection (diff) | |
| download | tgif-347408496a08f18b49b3646b6bb20d17cce85632.tar.xz | |
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
Diffstat (limited to 'Documentation/git-mergetool--lib.txt')
0 files changed, 0 insertions, 0 deletions