mirror of
				https://github.com/sharkdp/bat.git
				synced 2025-10-31 15:12:12 +00:00 
			
		
		
		
	Merge branch 'master' into doc_fix
This commit is contained in:
		| @@ -13,6 +13,7 @@ | ||||
| - Associate `os-release` with `bash` syntax, see #2587 (@cyqsimon) | ||||
| - Associate `Containerfile` with `Dockerfile` syntax, see #2606 (@einfachIrgendwer0815) | ||||
| - Replaced quotes with double quotes so fzf integration example script works on windows and linux. see #2095 (@johnmatthiggins) | ||||
| - Associate `ksh` files with `bash` syntax, see #2633 (@johnmatthiggins) | ||||
|  | ||||
| ## Themes | ||||
|  | ||||
|   | ||||
| @@ -90,6 +90,10 @@ impl<'a> SyntaxMapping<'a> { | ||||
|             .insert("Containerfile", MappingTarget::MapTo("Dockerfile")) | ||||
|             .unwrap(); | ||||
|  | ||||
|         mapping | ||||
|             .insert("*.ksh", MappingTarget::MapTo("Bourne Again Shell (bash)")) | ||||
|             .unwrap(); | ||||
|  | ||||
|         // Nginx and Apache syntax files both want to style all ".conf" files | ||||
|         // see #1131 and #1137 | ||||
|         mapping | ||||
|   | ||||
		Reference in New Issue
	
	Block a user