From ca6737f109eb486158ae4eca93cfafde9a612274 Mon Sep 17 00:00:00 2001
From: Philippe Dosch <Philippe.Dosch@loria.fr>
Date: Tue, 15 Mar 2022 10:22:28 +0100
Subject: [PATCH] Modifs pour 2022
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Remplacement de reset par restore, quelques précisions en plus par ailleurs
---
 commandes-thematiques.obj |  70 +++++++++---------
 gitmain.tex               |  10 +--
 maincommands.tex          |  54 ++++++++------
 princindex.obj            | 146 +++++++++++++++++++-------------------
 4 files changed, 146 insertions(+), 134 deletions(-)

diff --git a/commandes-thematiques.obj b/commandes-thematiques.obj
index 6946c0f..8c2d3d1 100644
--- a/commandes-thematiques.obj
+++ b/commandes-thematiques.obj
@@ -66,11 +66,11 @@ spline_tightness(1).
 page(1,"",1,'').
 box('#ff9966','',54,54,196,176,1,1,0,1,0,0,0,0,0,'1',0,[
 attr("", "auto_center_attr", 0, 1, 0,
-text('Black',125,53,1,1,1,144,15,2,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,65,'',[
-minilines(144,15,0,0,1,0,0,[
-mini_line(144,12,3,0,0,0,[
-str_block(0,144,12,3,0,-1,0,0,0,[
-str_seg('Black','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
+text('Black',125,52,1,1,1,144,16,2,13,3,0,0,0,0,-65534,144,16,0,0,"",0,0,0,0,65,'',[
+minilines(144,16,0,0,1,0,0,[
+mini_line(144,13,3,0,0,0,[
+str_block(0,144,13,3,0,-1,0,0,0,[
+str_seg('Black','Courier',0,80640,144,13,3,0,-1,0,0,0,0,0,
 	"auto_center_attr")])
 ])
 ])])),
@@ -106,11 +106,11 @@ str_seg('Black','Helvetica-Bold',1,103680,0,18,5,0,0,0,0,0,0,0,
 ]).
 box('#b3b300','',454,54,596,206,1,1,0,41,0,0,0,0,0,'1',0,[
 attr("", "auto_center_attr", 0, 1, 0,
-text('Black',525,53,1,1,1,144,15,42,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,65,'',[
-minilines(144,15,0,0,1,0,0,[
-mini_line(144,12,3,0,0,0,[
-str_block(0,144,12,3,0,-1,0,0,0,[
-str_seg('Black','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
+text('Black',525,52,1,1,1,144,16,42,13,3,0,0,0,0,-65534,144,16,0,0,"",0,0,0,0,65,'',[
+minilines(144,16,0,0,1,0,0,[
+mini_line(144,13,3,0,0,0,[
+str_block(0,144,13,3,0,-1,0,0,0,[
+str_seg('Black','Courier',0,80640,144,13,3,0,-1,0,0,0,0,0,
 	"auto_center_attr")])
 ])
 ])])),
@@ -128,8 +128,8 @@ str_seg('Black','Helvetica-Bold',1,103680,0,18,5,0,0,0,0,0,0,0,
 	"")])
 ]),
 mini_line(63,12,4,0,0,0,[
-str_block(0,63,12,4,0,-1,0,0,0,[
-str_seg('Black','Courier-Bold',1,80640,63,12,4,0,-1,0,0,0,0,0,
+str_block(0,63,12,4,0,0,0,0,0,[
+str_seg('Black','Courier-Bold',1,80640,63,12,4,0,0,0,0,0,0,0,
 	"git log")])
 ]),
 mini_line(72,12,4,0,0,0,[
@@ -156,11 +156,11 @@ str_seg('Black','Helvetica-Bold',1,103680,0,18,5,0,0,0,0,0,0,0,
 ]).
 box('#33a3a3','',254,54,396,176,1,1,0,77,0,0,0,0,0,'1',0,[
 attr("", "auto_center_attr", 0, 1, 0,
-text('Black',325,53,1,1,1,144,15,78,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,65,'',[
-minilines(144,15,0,0,1,0,0,[
-mini_line(144,12,3,0,0,0,[
-str_block(0,144,12,3,0,-1,0,0,0,[
-str_seg('Black','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
+text('Black',325,52,1,1,1,144,16,78,13,3,0,0,0,0,-65534,144,16,0,0,"",0,0,0,0,65,'',[
+minilines(144,16,0,0,1,0,0,[
+mini_line(144,13,3,0,0,0,[
+str_block(0,144,13,3,0,-1,0,0,0,[
+str_seg('Black','Courier',0,80640,144,13,3,0,-1,0,0,0,0,0,
 	"auto_center_attr")])
 ])
 ])])),
@@ -178,8 +178,8 @@ str_seg('Black','Helvetica-Bold',1,103680,0,18,5,0,0,0,0,0,0,0,
 	"")])
 ]),
 mini_line(63,12,4,0,0,0,[
-str_block(0,63,12,4,0,-1,0,0,0,[
-str_seg('Black','Courier-Bold',1,80640,63,12,4,0,-1,0,0,0,0,0,
+str_block(0,63,12,4,0,0,0,0,0,[
+str_seg('Black','Courier-Bold',1,80640,63,12,4,0,0,0,0,0,0,0,
 	"git add")])
 ]),
 mini_line(90,12,4,0,0,0,[
@@ -196,11 +196,11 @@ str_seg('Black','Helvetica-Bold',1,103680,0,18,5,0,0,0,0,0,0,0,
 ]).
 box('#9966cc','',154,254,296,406,1,1,0,110,0,0,0,0,0,'1',0,[
 attr("", "auto_center_attr", 0, 1, 0,
-text('Black',225,253,1,1,1,144,15,111,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,265,'',[
-minilines(144,15,0,0,1,0,0,[
-mini_line(144,12,3,0,0,0,[
-str_block(0,144,12,3,0,-1,0,0,0,[
-str_seg('Black','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
+text('Black',225,252,1,1,1,144,16,111,13,3,0,0,0,0,-65534,144,16,0,0,"",0,0,0,0,265,'',[
+minilines(144,16,0,0,1,0,0,[
+mini_line(144,13,3,0,0,0,[
+str_block(0,144,13,3,0,-1,0,0,0,[
+str_seg('Black','Courier',0,80640,144,13,3,0,-1,0,0,0,0,0,
 	"auto_center_attr")])
 ])
 ])])),
@@ -217,10 +217,10 @@ str_block(0,0,18,5,0,0,0,0,0,[
 str_seg('Black','Helvetica-Bold',1,103680,0,18,5,0,0,0,0,0,0,0,
 	"")])
 ]),
-mini_line(81,12,4,0,0,0,[
-str_block(0,81,12,4,0,-1,0,0,0,[
-str_seg('Black','Courier-Bold',1,80640,81,12,4,0,-1,0,0,0,0,0,
-	"git reset")])
+mini_line(99,12,4,0,0,0,[
+str_block(0,99,12,4,0,-1,0,0,0,[
+str_seg('Black','Courier-Bold',1,80640,99,12,4,0,-1,0,0,0,0,0,
+	"git restore")])
 ]),
 mini_line(54,12,4,0,0,0,[
 str_block(0,54,12,4,0,0,0,0,0,[
@@ -233,8 +233,8 @@ str_seg('Black','Courier-Bold',1,80640,54,12,4,0,0,0,0,0,0,0,
 	"git rm")])
 ]),
 mini_line(63,12,4,0,0,0,[
-str_block(0,63,12,4,0,-1,0,0,0,[
-str_seg('Black','Courier-Bold',1,80640,63,12,4,0,-1,0,0,0,0,0,
+str_block(0,63,12,4,0,0,0,0,0,[
+str_seg('Black','Courier-Bold',1,80640,63,12,4,0,0,0,0,0,0,0,
 	"git tag")])
 ]),
 mini_line(0,18,5,0,0,0,[
@@ -246,11 +246,11 @@ str_seg('Black','Helvetica-Bold',1,103680,0,18,5,0,0,0,0,0,0,0,
 ]).
 box('#ff3333','',354,254,516,376,1,1,0,143,0,0,0,0,0,'1',0,[
 attr("", "auto_center_attr", 0, 1, 0,
-text('Black',435,253,1,1,1,144,15,144,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,265,'',[
-minilines(144,15,0,0,1,0,0,[
-mini_line(144,12,3,0,0,0,[
-str_block(0,144,12,3,0,-1,0,0,0,[
-str_seg('Black','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
+text('Black',435,252,1,1,1,144,16,144,13,3,0,0,0,0,-65534,144,16,0,0,"",0,0,0,0,265,'',[
+minilines(144,16,0,0,1,0,0,[
+mini_line(144,13,3,0,0,0,[
+str_block(0,144,13,3,0,-1,0,0,0,[
+str_seg('Black','Courier',0,80640,144,13,3,0,-1,0,0,0,0,0,
 	"auto_center_attr")])
 ])
 ])])),
diff --git a/gitmain.tex b/gitmain.tex
index 09a9431..15254f4 100644
--- a/gitmain.tex
+++ b/gitmain.tex
@@ -2,7 +2,7 @@
 
 \title{Git}
 \subtitle{Principes et utilisation de base}
-\date{Mars 2020}
+\date{Mars 2022}
 
 % Un commentaire juste pour provoquer l'encodage : éàè
 
@@ -42,7 +42,7 @@
 
 \frame{\titlepage}
 
-\include{preambule}
+% \include{preambule}
 
 % ======================================================================
 
@@ -65,9 +65,9 @@
 % 2 points importants d'évolutions : introduire les hunks et git
 % checkout !
 
-\fixme{2 nouvelles commandes : switch et restore
-(https://medium.com/blue-harvest-tech-blog/git-2-23-0-forget-about-checkout-and-switch-to-restore-ac2682b737b3)
--> cela doit avoir des impacts dans le cours et dans ses dérivés !}
+% \fixme{2 nouvelles commandes : switch et restore
+% (https://medium.com/blue-harvest-tech-blog/git-2-23-0-forget-about-checkout-and-switch-to-restore-ac2682b737b3)
+% -> cela doit avoir des impacts dans le cours et dans ses dérivés !}
 
 % Des outils pour résoudre les conflits :
 % https://developer.atlassian.com/blog/2015/12/tips-tools-to-solve-git-conflicts/
diff --git a/maincommands.tex b/maincommands.tex
index 251a94c..7c97f85 100644
--- a/maincommands.tex
+++ b/maincommands.tex
@@ -98,6 +98,9 @@
   \item 
     Typiquement : un \emph{commit} = un ensemble atomique de
     modifications
+  \item
+    On peut aussi faire des ajouts plus fins à l'intérieur d'un
+    fichier(les \emph{chunks}) \emph{via} \ex{git add -p}
   \end{itemize}
 }
 
@@ -131,9 +134,9 @@
 %======================================================================
 
 \frame{\frametitle{Que mettre dans un log ?}
-  \fixme{Compléter avec
-  https://dev.to/chrissiemhrk/git-commit-message-5e21?utm_source=digest_mailer&utm_medium=email&utm_campaign=digest_email
-  ?}
+  % \fixme{Compléter avec
+  % https://dev.to/chrissiemhrk/git-commit-message-5e21?utm_source=digest_mailer&utm_medium=email&utm_campaign=digest_email
+  % ?}
   \framesubtitle{Techniquement...}
   \begin{itemize}
   \item
@@ -215,7 +218,8 @@
     \end{enumerate}
   \item
     Les fichiers qui n'ont jamais été indexés (typiquement, les
-    nouveaux fichiers du projet) ne sont donc pas concernés
+    nouveaux fichiers du projet) ne sont donc pas concernés~: c'est
+    \textbf{très généralement} ce qu'on souhaite
   \end{itemize}
 }
 
@@ -317,7 +321,7 @@
     de contenus entre 2 \emph{commits} spécifiques (le premier
     \emph{commit} fourni doit être le plus récent)
   \item
-    \ex{git diff --cached} : différences entre l'index et le dernier
+    \ex{git diff -{}-cached} : différences entre l'index et le dernier
     \emph{commit}
   \item
     \ex{git diff HEAD} : différences entre le répertoire de travail et
@@ -353,7 +357,9 @@
     Exemples typiques de balises : v1.0, prod2.0, final4.4...
   \item
     Attention : les tags ne sont pas transférés \emph{par défaut} lors
-    des synchronisations avec les dépôts distants
+    des synchronisations avec les dépôts distants\\
+    (utiliser \ex{git push -{}-tags} \textbf{en plus} d'un \ex{git
+    push})
   \end{itemize}
 }
 
@@ -369,24 +375,21 @@
 
 %======================================================================
 
-\frame{\frametitle{\ext{git reset}}
+\frame{\frametitle{\ext{git restore}}
   \framesubtitle{\gitop}
   \begin{itemize}
   \item
-    Supprime des modifications effectuées dans l'index ou le dépôt
-    local
-  \item
-    À utiliser avec précaution, certaines suppressions deviennent
-    irrévocables...
+    Restaure le \emph{working directory}
   \item
-    \textbf{Il est souvent plus approprié de faire un nouveau
-      \emph{commit} annulant le \emph{commit} concerné} (voir \ex{git
-        revert})
+    Utile pour rétablir l'état du répertoire de travail au dernier
+    \emph{commit} effectué (et supprimer ainsi toutes les
+    modifications effectuées depuis)\\
+    \ex{git restore .}
   \item
-    Un exemple utile toutefois pour rétablir l'état du répertoire de
-    travail au dernier \emph{commit} effectué (et supprimer ainsi
-    toutes les opérations effectuées depuis)\\
-    \ex{git reset -{}-hard}
+    Par défaut, restaure à partir de l'index (cas le plus général)
+  \item 
+    Utiliser \ex{-{}-staged} pour restaurer à partir du dépôt local
+    sinon
   \end{itemize}
 }
 
@@ -400,6 +403,15 @@
   \item
     Ce \emph{contre-commit} est un commit venant exactement annuler
     les modifications introduites par un commit particulier
+  \item
+    En cas d'erreur introduite par un commit
+    \begin{itemize}
+    \item
+      seul sur un dépôt : à privilégier
+    \item
+      travail collaboratif : quasi-obligatoire (problème de
+      synchronisation sinon)
+    \end{itemize}
   \item
     Syntaxe\\
     \ex{git revert \emph{commit}}
@@ -543,8 +555,8 @@
   \item
     \ex{git tag} : associe une balise à un \emph{commit}
   \item
-    \ex{git reset} : supprime des modifications effectuées dans
-    l'index ou le dépôt local
+    \ex{git restore} : restaure le \emph{working directory} depuis
+    l'index (ou le dépôt local)
   \item
     \ex{git mv} : déplace des fichiers
   \item
diff --git a/princindex.obj b/princindex.obj
index cf3accd..3bd5802 100644
--- a/princindex.obj
+++ b/princindex.obj
@@ -72,25 +72,25 @@ polygon('#7da647','',13,[
 ]),
 box('#7da647','',704,225,846,275,1,1,0,27,0,0,0,0,0,'1',0,[
 attr("", "auto_center_attr", 0, 1, 0,
-text('Black',775,224,1,1,1,144,15,28,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,236,'',[
-minilines(144,15,0,0,1,0,0,[
-mini_line(144,12,3,0,0,0,[
-str_block(0,144,12,3,0,-1,0,0,0,[
-str_seg('Black','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
+text('Black',775,223,1,1,1,144,16,28,13,3,0,0,0,0,-65534,144,16,0,0,"",0,0,0,0,236,'',[
+minilines(144,16,0,0,1,0,0,[
+mini_line(144,13,3,0,0,0,[
+str_block(0,144,13,3,0,-1,0,0,0,[
+str_seg('Black','Courier',0,80640,144,13,3,0,-1,0,0,0,0,0,
 	"auto_center_attr")])
 ])
 ])])),
 attr("label=", "D\351p\364t local", 1, 0, 0,
-text('Black',774,231,2,1,1,107,37,29,16,4,0,0,0,0,-65534,107,37,0,0,"",0,0,0,0,247,'',[
-minilines(107,37,0,0,1,0,0,[
-mini_line(89,16,4,0,0,0,[
-str_block(0,89,16,4,0,-1,0,0,0,[
-str_seg('White','Helvetica-Bold',1,97920,89,16,4,0,-1,0,0,0,0,0,
+text('Black',774,230,2,1,1,107,38,29,17,4,0,0,0,0,-65534,107,38,0,0,"",0,0,0,0,247,'',[
+minilines(107,38,0,0,1,0,0,[
+mini_line(93,17,4,0,0,0,[
+str_block(0,93,17,4,0,-1,0,0,0,[
+str_seg('White','Helvetica-Bold',1,97920,93,17,4,0,-1,0,0,0,0,0,
 	"D\351p\364t local")])
 ]),
 mini_line(107,14,3,0,0,0,[
-str_block(0,107,14,3,0,-1,0,0,0,[
-str_seg('White','Helvetica-Oblique',2,80640,107,14,3,0,-1,0,0,0,0,0,
+str_block(0,107,14,3,0,0,0,0,0,[
+str_seg('White','Helvetica-Oblique',2,80640,107,14,3,0,0,0,0,0,0,0,
 	"(local repository)")])
 ])
 ])]))
@@ -106,20 +106,20 @@ polygon('#0099ff','',13,[
 ]),
 box('#0099ff','',404,225,546,275,1,1,0,32,0,0,0,0,0,'1',0,[
 attr("", "auto_center_attr", 0, 1, 0,
-text('Black',475,224,1,1,1,144,15,33,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,236,'',[
-minilines(144,15,0,0,1,0,0,[
-mini_line(144,12,3,0,0,0,[
-str_block(0,144,12,3,0,-1,0,0,0,[
-str_seg('Black','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
+text('Black',475,223,1,1,1,144,16,33,13,3,0,0,0,0,-65534,144,16,0,0,"",0,0,0,0,236,'',[
+minilines(144,16,0,0,1,0,0,[
+mini_line(144,13,3,0,0,0,[
+str_block(0,144,13,3,0,-1,0,0,0,[
+str_seg('Black','Courier',0,80640,144,13,3,0,-1,0,0,0,0,0,
 	"auto_center_attr")])
 ])
 ])])),
 attr("label=", "Index", 1, 0, 0,
-text('Black',474,240,1,1,1,43,20,34,16,4,0,0,0,0,-65534,43,20,0,0,"",0,0,0,0,256,'',[
-minilines(43,20,0,0,1,0,0,[
-mini_line(43,16,4,0,0,0,[
-str_block(0,43,16,4,0,-1,0,0,0,[
-str_seg('White','Helvetica-Bold',1,97920,43,16,4,0,-1,0,0,0,0,0,
+text('Black',474,239,1,1,1,45,21,34,17,4,0,0,0,0,-65534,45,21,0,0,"",0,0,0,0,256,'',[
+minilines(45,21,0,0,1,0,0,[
+mini_line(45,17,4,0,0,0,[
+str_block(0,45,17,4,0,-1,0,0,0,[
+str_seg('White','Helvetica-Bold',1,97920,45,17,4,0,-1,0,0,0,0,0,
 	"Index")])
 ])
 ])]))
@@ -135,30 +135,30 @@ polygon('#b84747','',13,[
 ]),
 box('#b84747','',104,225,246,275,1,1,0,37,0,0,0,0,0,'1',0,[
 attr("", "auto_center_attr", 0, 1, 0,
-text('Black',175,224,1,1,1,144,15,38,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,236,'',[
-minilines(144,15,0,0,1,0,0,[
-mini_line(144,12,3,0,0,0,[
-str_block(0,144,12,3,0,-1,0,0,0,[
-str_seg('Black','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
+text('Black',175,223,1,1,1,144,16,38,13,3,0,0,0,0,-65534,144,16,0,0,"",0,0,0,0,236,'',[
+minilines(144,16,0,0,1,0,0,[
+mini_line(144,13,3,0,0,0,[
+str_block(0,144,13,3,0,-1,0,0,0,[
+str_seg('Black','Courier',0,80640,144,13,3,0,-1,0,0,0,0,0,
 	"auto_center_attr")])
 ])
 ])])),
 attr("label=", "R\351pertoire de", 1, 0, 0,
-text('Black',175,222,3,1,1,120,57,39,16,4,0,0,0,0,-65534,120,57,0,0,"",0,0,0,0,238,'',[
-minilines(120,57,0,0,1,0,0,[
-mini_line(109,16,4,0,0,0,[
-str_block(0,109,16,4,0,-1,0,0,0,[
-str_seg('White','Helvetica-Bold',1,97920,109,16,4,0,-1,0,0,0,0,0,
+text('Black',175,221,3,1,1,120,59,39,17,4,0,0,0,0,-65534,120,59,0,0,"",0,0,0,0,238,'',[
+minilines(120,59,0,0,1,0,0,[
+mini_line(112,17,4,0,0,0,[
+str_block(0,112,17,4,0,-1,0,0,0,[
+str_seg('White','Helvetica-Bold',1,97920,112,17,4,0,-1,0,0,0,0,0,
 	"R\351pertoire de")])
 ]),
-mini_line(47,16,4,0,0,0,[
-str_block(0,47,16,4,0,-1,0,0,0,[
-str_seg('White','Helvetica-Bold',1,97920,47,16,4,0,-1,0,0,0,0,0,
+mini_line(53,17,4,0,0,0,[
+str_block(0,53,17,4,0,-1,0,0,0,[
+str_seg('White','Helvetica-Bold',1,97920,53,17,4,0,-1,0,0,0,0,0,
 	"travail")])
 ]),
 mini_line(120,14,3,0,0,0,[
-str_block(0,120,14,3,0,-1,0,0,0,[
-str_seg('White','Helvetica-Oblique',2,80640,120,14,3,0,-1,0,0,0,0,0,
+str_block(0,120,14,3,0,0,0,0,0,[
+str_seg('White','Helvetica-Oblique',2,80640,120,14,3,0,0,0,0,0,0,0,
 	"(working directory)")])
 ])
 ])]))
@@ -196,51 +196,51 @@ poly('Black','',2,[
     "0","",[
     0,12,5,0,'12','5','0'],[0,12,5,0,'12','5','0'],[
 ]).
-text('Black',300,104,1,0,1,66,20,442,16,4,0,0,0,0,-65534,66,20,0,0,"",0,0,0,0,120,'',[
-minilines(66,20,0,0,0,0,0,[
-mini_line(66,16,4,0,0,0,[
-str_block(0,66,16,4,0,-1,0,0,0,[
-str_seg('Black','Helvetica-Bold',1,97920,66,16,4,0,-1,0,0,0,0,0,
-	"git reset")])
+text('Black',300,103,1,0,1,86,21,442,17,4,0,0,0,0,-65534,86,21,0,0,"",0,0,0,0,120,'',[
+minilines(86,21,0,0,0,0,0,[
+mini_line(86,17,4,0,0,0,[
+str_block(0,86,17,4,0,-1,0,0,0,[
+str_seg('Black','Helvetica-Bold',1,97920,86,17,4,0,-1,0,0,0,0,0,
+	"git restore")])
 ])
 ])]).
-text('Black',300,154,1,0,1,54,20,444,16,4,0,0,0,0,-65534,54,20,0,0,"",0,0,0,0,170,'',[
-minilines(54,20,0,0,0,0,0,[
-mini_line(54,16,4,0,0,0,[
-str_block(0,54,16,4,0,-1,0,0,0,[
-str_seg('Black','Helvetica-Bold',1,97920,54,16,4,0,-1,0,0,0,0,0,
+text('Black',300,153,1,0,1,56,21,444,17,4,0,0,0,0,-65534,56,21,0,0,"",0,0,0,0,170,'',[
+minilines(56,21,0,0,0,0,0,[
+mini_line(56,17,4,0,0,0,[
+str_block(0,56,17,4,0,-1,0,0,0,[
+str_seg('Black','Helvetica-Bold',1,97920,56,17,4,0,-1,0,0,0,0,0,
 	"git add")])
 ])
 ])]).
-text('Black',440,54,1,0,1,101,20,445,16,4,0,0,0,0,-65534,101,20,0,0,"",0,0,0,0,70,'',[
-minilines(101,20,0,0,0,0,0,[
-mini_line(101,16,4,0,0,0,[
-str_block(0,101,16,4,0,0,0,0,0,[
-str_seg('Black','Helvetica-Bold',1,97920,101,16,4,0,0,0,0,0,0,0,
+text('Black',440,53,1,0,1,108,21,445,17,4,0,0,0,0,-65534,108,21,0,0,"",0,0,0,0,70,'',[
+minilines(108,21,0,0,0,0,0,[
+mini_line(108,17,4,0,0,0,[
+str_block(0,108,17,4,0,-1,0,0,0,[
+str_seg('Black','Helvetica-Bold',1,97920,108,17,4,0,-1,0,0,0,0,0,
 	"git commit -a")])
 ])
 ])]).
-text('Black',600,154,1,0,1,82,20,447,16,4,0,0,0,0,-65534,82,20,0,0,"",0,0,0,0,170,'',[
-minilines(82,20,0,0,0,0,0,[
-mini_line(82,16,4,0,0,0,[
-str_block(0,82,16,4,0,-1,0,0,0,[
-str_seg('Black','Helvetica-Bold',1,97920,82,16,4,0,-1,0,0,0,0,0,
+text('Black',600,153,1,0,1,87,21,447,17,4,0,0,0,0,-65534,87,21,0,0,"",0,0,0,0,170,'',[
+minilines(87,21,0,0,0,0,0,[
+mini_line(87,17,4,0,0,0,[
+str_block(0,87,17,4,0,-1,0,0,0,[
+str_seg('Black','Helvetica-Bold',1,97920,87,17,4,0,-1,0,0,0,0,0,
 	"git commit")])
 ])
 ])]).
-text('Black',290,324,1,0,1,51,20,448,16,4,0,0,0,0,-65534,51,20,0,0,"",0,0,0,0,340,'',[
-minilines(51,20,0,0,0,0,0,[
-mini_line(51,16,4,0,0,0,[
-str_block(0,51,16,4,0,-1,0,0,0,[
-str_seg('Black','Helvetica-Bold',1,97920,51,16,4,0,-1,0,0,0,0,0,
+text('Black',290,323,1,0,1,53,21,448,17,4,0,0,0,0,-65534,53,21,0,0,"",0,0,0,0,340,'',[
+minilines(53,21,0,0,0,0,0,[
+mini_line(53,17,4,0,0,0,[
+str_block(0,53,17,4,0,-1,0,0,0,[
+str_seg('Black','Helvetica-Bold',1,97920,53,17,4,0,-1,0,0,0,0,0,
 	"git diff")])
 ])
 ])]).
-text('Black',580,324,1,0,1,123,20,449,16,4,0,0,0,0,-65534,123,20,0,0,"",0,0,0,0,340,'',[
-minilines(123,20,0,0,0,0,0,[
-mini_line(123,16,4,0,0,0,[
-str_block(0,123,16,4,0,-1,0,0,0,[
-str_seg('Black','Helvetica-Bold',1,97920,123,16,4,0,-1,0,0,0,0,0,
+text('Black',580,323,1,0,1,130,21,449,17,4,0,0,0,0,-65534,130,21,0,0,"",0,0,0,0,340,'',[
+minilines(130,21,0,0,0,0,0,[
+mini_line(130,17,4,0,0,0,[
+str_block(0,130,17,4,0,-1,0,0,0,[
+str_seg('Black','Helvetica-Bold',1,97920,130,17,4,0,-1,0,0,0,0,0,
 	"git diff --cached")])
 ])
 ])]).
@@ -249,11 +249,11 @@ poly('Black','',2,[
     "0","",[
     0,12,5,0,'12','5','0'],[0,12,5,0,'12','5','0'],[
 ]).
-text('Black',430,374,1,0,1,102,20,451,16,4,0,0,0,0,-65534,102,20,0,0,"",0,0,0,0,390,'',[
-minilines(102,20,0,0,0,0,0,[
-mini_line(102,16,4,0,0,0,[
-str_block(0,102,16,4,0,-1,0,0,0,[
-str_seg('Black','Helvetica-Bold',1,97920,102,16,4,0,-1,0,0,0,0,0,
+text('Black',430,373,1,0,1,105,21,451,17,4,0,0,0,0,-65534,105,21,0,0,"",0,0,0,0,390,'',[
+minilines(105,21,0,0,0,0,0,[
+mini_line(105,17,4,0,0,0,[
+str_block(0,105,17,4,0,0,0,0,0,[
+str_seg('Black','Helvetica-Bold',1,97920,105,17,4,0,0,0,0,0,0,0,
 	"git diff HEAD")])
 ])
 ])]).
-- 
GitLab