diff --git a/collabowork.tex b/collabowork.tex
index ee0a54828e70a127b6e663edf36b1fb5ed65f2f2..1b3217870e9e8bf50e1ee3a8d099ad16768898ba 100644
--- a/collabowork.tex
+++ b/collabowork.tex
@@ -174,7 +174,7 @@
   \end{itemize}
   
   \begin{codebox}
-    \mygit{git push}{gitpush.txt}
+    \mygitti{git push}{gitpush.txt}
   \end{codebox}
 }
 
@@ -194,9 +194,9 @@
 
 \frame{\frametitle{Cas idéal}
   \framesubtitle{Du côté de chez Alice...}
-  \mygitpromptplus{alice}{emacs README}\\
-  \mygitpromptplus{alice}{git add README}\\
-  \mygitprompt{alice}{git commit -m "Minor updates"}{gitcomalic.txt}
+  \mygitpromptplus{alice}{emacs README.md}\\
+  \mygitpromptplus{alice}{git add README.md}\\
+  \mygitprompt{alice}{git commit -m "Quelques précisions dans la doc"}{gitcomalic.txt}
   \mygitprompt{alice}{git push}{gitpushconf.txt}
 }
 
@@ -204,9 +204,9 @@
 
 \frame{\frametitle{Cas idéal}
   \framesubtitle{Du côté de chez Bob...}
-  \mygitpromptplus{bob}{emacs README}\\
-  \mygitpromptplus{bob}{git add README}\\
-  \mygitprompt{bob}{git commit -m "Bug fixed"}{gitcombob.txt}
+  \mygitpromptplus{bob}{emacs README.md}\\
+  \mygitpromptplus{bob}{git add README.md}\\
+  \mygitprompt{bob}{git commit -m "Un titre ajouté"}{gitcombob.txt}
   \mygitprompt{bob}{git push}{gitpushcoll.txt}
 }
 
@@ -236,18 +236,18 @@
 
 \frame{\frametitle{Conflit}
   \framesubtitle{Du côté de chez Alice...}
-  \mygitpromptplus{alice}{emacs README}\\
-  \mygitpromptplus{alice}{git add README}\\
-  \mygitprompt{alice}{git commit -m "Minor updates"}{gitcomalic.txt}
+  \mygitpromptplus{alice}{emacs README.md}\\
+  \mygitpromptplus{alice}{git add README.md}\\
+  \mygitprompt{alice}{git commit -m "Quelques précisions dans la doc"}{gitcomalic.txt}
 }
 
 %======================================================================
 
 \frame{\frametitle{Conflit}
   \framesubtitle{Du côté de chez Bob...}
-  \mygitpromptplus{bob}{emacs README}\\
-  \mygitpromptplus{bob}{git add README}\\
-  \mygitprompt{bob}{git commit -m "Bug fixed"}{gitcombob.txt}
+  \mygitpromptplus{bob}{emacs README.md}\\
+  \mygitpromptplus{bob}{git add README.md}\\
+  \mygitprompt{bob}{git commit -m "Un titre ajouté"}{gitcombob.txt}
   \mygitprompt{bob}{git pull}{gitpullconflit.txt}
 }
 
@@ -263,7 +263,7 @@
     Le fichier en cause contient une zone délimitée par des chevrons
   \end{itemize}
   
-  \mygit{cat README}{gitconflit.txt}
+  \mygit{cat README.md}{gitconflit.txt}
 }
 
 %======================================================================
@@ -284,8 +284,8 @@
 
 \frame{\frametitle{Conflit}
   \framesubtitle{Du côté de chez Bob...}
-  \mygitpromptplus{bob}{git add README}\\
-  \mygitprompt{bob}{git commit -m "Conflict fixed"}{gitconffix.txt}
+  \mygitpromptplus{bob}{git add README.md}\\
+  \mygitprompt{bob}{git commit -m "Conflit résolu"}{gitconffix.txt}
   \mygitprompt{bob}{git push}{gitpushconf.txt}
 }
 
diff --git a/gitcomalic.txt b/gitcomalic.txt
index 4a1403d404a86859fba80036252d65948f837eb7..40c90e94f34c88f809d5b215232ec8f93aaece1c 100644
--- a/gitcomalic.txt
+++ b/gitcomalic.txt
@@ -1,3 +1,2 @@
-[master c70cf61] Minor updates
- Committer: Alice <alice@merveilles.com>
- 1 files changed, 2 insertions(+), 1 deletions(-)
+[master d0ca99b] Quelques précisions dans la doc
+ 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gitcombob.txt b/gitcombob.txt
index bd1ce8c937aebf604a01cb893a182a8dda28dab9..47c2e50be1978a771fe3cdc27861aebc2e0030b7 100644
--- a/gitcombob.txt
+++ b/gitcombob.txt
@@ -1,3 +1,3 @@
-[master 70fcf61] Bug fixed
- Committer: Bob <bob.leponge@cartoon.net>
- 1 files changed, 2 insertions(+), 1 deletions(-)
+[master 83dc651] Un titre ajouté
+ 1 file changed, 2 insertions(+)
+ 
diff --git a/gitconffix.txt b/gitconffix.txt
index 84ac85a27cd4521ca57c6ea5908282080970e07e..0f2bb8f59bd7b0de62bac09610353514091ccd11 100644
--- a/gitconffix.txt
+++ b/gitconffix.txt
@@ -1 +1 @@
-[master 8f999f1] Conflict fixed
+[master 6c99a92] Conflit résolu
diff --git a/gitconflit.txt b/gitconflit.txt
index cecf545c8edf34ec9375b43bad9f182dccb2340c..3d469e9eae1d7d4c956a0bbcd14be9e0270ca186 100644
--- a/gitconflit.txt
+++ b/gitconflit.txt
@@ -1,7 +1,5 @@
 <<<<<<< HEAD
-Dessus...
-Yopla
+Mon tellement beau titre !
 =======
-Yopla
-Dessous...
->>>>>>> c70cf6111a19192fed3b7aebd1e0a3e7088b28d0
+Mon beau titre (génial) !
+>>>>>>> 91bb53f475d2d41c38cfdb6bf0b047a688bd4c3a
diff --git a/gitpullconflit.txt b/gitpullconflit.txt
index e6f354533178b0a844552faf05d4737c0a6394cc..a9b1d1ec2613635861e36b233eb6a68e619625ad 100644
--- a/gitpullconflit.txt
+++ b/gitpullconflit.txt
@@ -1,8 +1,10 @@
-remote: Counting objects: 5, done.
-remote: Total 3 (delta 0), reused 0 (delta 0)
-Unpacking objects: 100% (3/3), done.
-From /var/git/test
-   55ad751..c70cf61  master     -> origin/master
-Auto-merging README
-CONFLICT (content): Merge conflict in README
-Automatic merge failed; fix conflicts and then commit the result.
+remote: Enumerating objects: 5, done.
+remote: Counting objects: 100% (5/5), done.
+remote: Compressing objects: 100% (2/2), done.
+remote: Total 3 (delta 1), reused 3 (delta 1), pack-reused 0 (from 0)
+Dépaquetage des objets: 100% (3/3), 335 octets | 335.00 Kio/s, fait.
+Depuis github.com:loirotte/coursgit
+   184008f..91bb53f  master     -> origin/master
+Fusion automatique de README.md
+CONFLIT (contenu) : Conflit de fusion dans README.md
+La fusion automatique a échoué ; réglez les conflits et validez le résultat.
diff --git a/gitpullok.txt b/gitpullok.txt
index 1b8fe93f71f2d263c14be1623667ed63b979bee2..887119e536d5869f63cad6ab4ff627bd09807dd1 100644
--- a/gitpullok.txt
+++ b/gitpullok.txt
@@ -1,10 +1,11 @@
-remote: Counting objects: 5, done.
+remote: Enumerating objects: 5, done.
+remote: Counting objects: 100% (5/5), done.
 remote: Compressing objects: 100% (2/2), done.
-remote: Total 3 (delta 0), reused 0 (delta 0)
-Unpacking objects: 100% (3/3), done.
-From /var/git/test
-   8f999f1..0455941  master     -> origin/master
-Auto-merging README
-Merge made by recursive.
- README |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
+remote: Total 3 (delta 1), reused 3 (delta 1), pack-reused 0 (from 0)
+Dépaquetage des objets: 100% (3/3), 337 octets | 337.00 Kio/s, fait.
+Depuis github.com:loirotte/coursgit
+   93e0999..d0ca99b  master     -> origin/master
+Fusion automatique de README.md
+Merge made by the 'ort' strategy.
+ README.md | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gitpush.txt b/gitpush.txt
index e15e69b67506ab38a333a87d0477140b667cf258..b58354257d475fe43da9a1f45851088a093aa5a2 100644
--- a/gitpush.txt
+++ b/gitpush.txt
@@ -1,7 +1,9 @@
-Counting objects: 5, done.
-Delta compression using up to 4 threads.
-Compressing objects: 100% (3/3), done.
-Writing objects: 100% (3/3), 356 bytes, done.
-Total 3 (delta 0), reused 0 (delta 0)
-To git@github.com:dosch/test.git
-   ff367fc..f20eb85  master -> master
+Énumération des objets: 5, fait.
+Décompte des objets: 100% (5/5), fait.
+Compression par delta en utilisant jusqu'à 12 fils d'exécution
+Compression des objets: 100% (2/2), fait.
+Écriture des objets: 100% (3/3), 305 octets | 305.00 Kio/s, fait.
+Total 3 (delta 1), réutilisés 0 (delta 0), réutilisés du pack 0
+remote: Resolving deltas: 100% (1/1), completed with 1 local object.
+To github.com:loirotte/coursgit.git
+   8360303..d36979c  master -> master
diff --git a/gitpushcoll.txt b/gitpushcoll.txt
index 1b9949ab716d277b6d4440fabbf63baee1b8877e..eaabc0118a4faabc551265c513631c9a9cee076b 100644
--- a/gitpushcoll.txt
+++ b/gitpushcoll.txt
@@ -1,6 +1,8 @@
-To /var/git/test.git
- ! [rejected]        master -> master (non-fast-forward)
-error: failed to push some refs to '/var/git/test.git'
-To prevent you from losing history, non-fast-forward updates were rejected
-Merge the remote changes (e.g. 'git pull') before pushing again.  See the
-'Note about fast-forwards' section of 'git push --help' for details.
+To github.com:loirotte/coursgit.git
+ ! [rejected]        master -> master (fetch first)
+error: impossible de pousser des références vers 'github.com:loirotte/coursgit.git'
+astuce: Updates were rejected because the remote contains work that you do not
+astuce: have locally. This is usually caused by another repository pushing to
+astuce: the same ref. If you want to integrate the remote changes, use
+astuce: 'git pull' before pushing again.
+astuce: See the 'Note about fast-forwards' in 'git push --help' for details.
diff --git a/gitpushconf.txt b/gitpushconf.txt
index 24f9805ac2947f7952f79314c08b66640a2f3756..baca665b849747ee6ae6235252444d18108f4027 100644
--- a/gitpushconf.txt
+++ b/gitpushconf.txt
@@ -1,8 +1,9 @@
-Counting objects: 10, done.
-Delta compression using up to 4 threads.
-Compressing objects: 100% (2/2), done.
-Writing objects: 100% (6/6), 533 bytes, done.
-Total 6 (delta 0), reused 0 (delta 0)
-Unpacking objects: 100% (6/6), done.
-To /var/git/test.git
-   c70cf61..8f999f1  master -> master
+Énumération des objets: 5, fait.
+Décompte des objets: 100% (5/5), fait.
+Compression par delta en utilisant jusqu'à 12 fils d'exécution
+Compression des objets: 100% (3/3), fait.
+Écriture des objets: 100% (3/3), 357 octets | 357.00 Kio/s, fait.
+Total 3 (delta 1), réutilisés 0 (delta 0), réutilisés du pack 0
+remote: Resolving deltas: 100% (1/1), completed with 1 local object.
+To github.com:loirotte/coursgit.git
+   93e0999..d0ca99b  master -> master
diff --git a/gitpushok.txt b/gitpushok.txt
index 83e6d57a5e8d1835323e2f0deaa0988cdb3d3a98..d34c57d63928ddbbc8b77f689412f0e68ea6d8d0 100644
--- a/gitpushok.txt
+++ b/gitpushok.txt
@@ -1,8 +1,9 @@
-Counting objects: 10, done.
-Delta compression using up to 4 threads.
-Compressing objects: 100% (4/4), done.
-Writing objects: 100% (6/6), 592 bytes, done.
-Total 6 (delta 0), reused 0 (delta 0)
-Unpacking objects: 100% (6/6), done.
-To /var/git/test.git
-   0455941..78b618f  master -> master
+Énumération des objets: 10, fait.
+Décompte des objets: 100% (10/10), fait.
+Compression par delta en utilisant jusqu'à 12 fils d'exécution
+Compression des objets: 100% (6/6), fait.
+Écriture des objets: 100% (6/6), 667 octets | 667.00 Kio/s, fait.
+Total 6 (delta 2), réutilisés 0 (delta 0), réutilisés du pack 0
+remote: Resolving deltas: 100% (2/2), completed with 1 local object.
+To github.com:loirotte/coursgit.git
+   d0ca99b..184008f  master -> master