Merge pull request BurntSushi#2 from BurntSushi/master

merge
wacfork · Aug 19, 2022 · db710b8 · db710b8
2 parents 6671a7a + a026788
commit db710b8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/.ignore b/.ignore
@@ -0,0 +1 @@
+!/.github/
diff --git a/GUIDE.md b/GUIDE.md
@@ -190,7 +190,8 @@ the following:
 All of these things can be toggled using various flags provided by ripgrep:
 
 1. You can disable all ignore-related filtering with the `--no-ignore` flag.
-2. Hidden files and directories can be searched with the `--hidden` flag.
+2. Hidden files and directories can be searched with the `--hidden` (`-.` for 
+short) flag.
 3. Binary files can be searched via the `--text` (`-a` for short) flag.
    Be careful with this flag! Binary files may emit control characters to your
    terminal, which might cause strange behavior.

diff --git a/crates/ignore/src/default_types.rs b/crates/ignore/src/default_types.rs
@@ -225,6 +225,7 @@ pub const DEFAULT_TYPES: &[(&str, &[&str])] = &[
     ("slim", &["*.skim", "*.slim", "*.slime"]),
     ("smarty", &["*.tpl"]),
     ("sml", &["*.sml", "*.sig"]),
+    ("solidity", &["*.sol"]),
     ("soy", &["*.soy"]),
     ("spark", &["*.spark"]),
     ("spec", &["*.spec"]),