diff --git a/config_files/.vimrc b/config_files/.vimrc
index 456f413..efed60f 100644
--- a/config_files/.vimrc
+++ b/config_files/.vimrc
@@ -171,8 +171,9 @@ au filetype text set cocu=n cole=3
 " soient nettoyes par la commande 'hi clear' du fichier
 " $VIMRUNTIME/color/default.vim
 au filetype text hi AsteriskBold ctermfg=Green cterm=bold
-au filetype text syn match Asterisks contained "**" conceal
-au filetype text syn match AsteriskBold "\*\*.*\*\*" contains=Asterisks
+au filetype text syn match Asterisks contained "\*\*" conceal
+au filetype text syn match EscapedAsterisks contained "\\" conceal
+au filetype text syn match AsteriskBold "\*\*.*\*\*" contains=Asterisks,EscapedAsterisks
 
 
 "---------------------------------------------------------------
diff --git a/tutos/git.txt b/tutos/git.txt
index 4b9af56..ca3acd9 100644
--- a/tutos/git.txt
+++ b/tutos/git.txt
@@ -35,6 +35,7 @@
 **git config --global credential.helper store** store the passwords in .git-credentials in the HOME directory (thanks to global, as opposed to the project directory) so you don't have tot type it each time
 **git config --global core.editor "vim"** change the git editor for vim
 **git cherry-pick NAME_OF_BRANCH** it merge a branch into the actual one, but only with the last commit
+**git --squash** https://stackoverflow.com/questions/23616706/git-squash-and-merge
 **git log --graph** show the graph of the commits with branchs
 **git log --first-parent master** show all the commits directly on master (or other branch)
 **relier dossier sur serveur en local avec git**
diff --git a/tutos/vim.txt b/tutos/vim.txt
index 6ae8795..7a50417 100644
--- a/tutos/vim.txt
+++ b/tutos/vim.txt
@@ -24,6 +24,16 @@
 	**:bd** delete buffer
 	**:b#** switch to last edited buffer
 	**:explore / :ex<tab>** navigate through directory, rename, and plus
+**search through files :**
+	**:vim** the one function that gets to be name as the software ;)
+		 performes a kind of grep search on a list of files
+	**:vim pattern *\* ** performs search on all sub folders
+	**:vim pattern *.xml *.cpp** (without space between the two dots) performs search on all files of these extensions
+	**:cn** go to next search result (might be in same file)
+	**:cp** go to previous search result (might be in same file)
+	**:cnf** go to next search result in next file
+	**:cpf** go to previous search result in previous file
+	**:cw** list all results
 **:%y+** copie toutes les lignes DANS LE CLIPBOARD
 **:set paste** copier sans les effets des tabulations
 **: up** affiche les dernieres commandes