Merge branch 'master' of https://git.jonfu.com/jon/dots

2021-01-31 08:12:12 -06:00
parent c8f84a8f7f 3d62395529
commit 93c6983260
1 changed files with 6 additions and 0 deletions
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -31,7 +31,11 @@ alias ip='ip -c'
 alias s='sudo'
 alias df='sudo df -hT -x tmpfs -x devtmpfs'

+<<<<<<< HEAD
 bind 'set completion-ignore-case on'
+=======
+set bell-style none
+>>>>>>> 3d623955297969837dad68344ea49fc073d400bc

 ## function and alias for short find
 short_find() {
@@ -165,3 +169,5 @@ ex() {
    done
    return "$e"
 }
+
+# turn off incredibly annoying bell