dépôt local pas fini

concepts_commits_1.svg

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="600" height="100" >
 
-<circle cx="50" cy="50" r="30" stroke="black" stroke-width="3" fill="lightgreen"/>
+<circle cx="50" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
 <text x="45" y="55" font-size="18"> 1 </text>
 
-<circle cx="150" cy="50" r="30" stroke="black" stroke-width="3" fill="lightgreen"/>
+<circle cx="150" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
 <text x="145" y="55" font-size="18"> 2 </text>
 
-<circle cx="250" cy="50" r="30" stroke="black" stroke-width="3" fill="lightgreen"/>
+<circle cx="250" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
 <text x="245" y="55" font-size="18"> 3 </text>
 
-<circle cx="350" cy="50" r="30" stroke="black" stroke-width="3" fill="lightgreen"/>
+<circle cx="350" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
 <text x="345" y="55" font-size="18"> 4 </text>
 
 <defs>
@@ -19,9 +19,9 @@
 </marker>
 </defs>
 
-<path marker-end='url(#head)' stroke-width='3' stroke='black' d='M80,50 L110,50' />
-<path marker-end='url(#head)' stroke-width='3' stroke='black' d='M180,50 L210,50' />
-<path marker-end='url(#head)' stroke-width='3' stroke='black' d='M280,50 L310,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M80,50 L110,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M180,50 L210,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M280,50 L310,50' />
 
 </svg>
 

concepts_commits_2.svg

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="600" height="200" >
 
-<circle cx="50" cy="50" r="30" stroke="black" stroke-width="3" fill="lightgreen"/>
+<circle cx="50" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
 <text x="45" y="55" font-size="18"> 1 </text>
 
-<circle cx="150" cy="50" r="30" stroke="black" stroke-width="3" fill="lightgreen"/>
+<circle cx="150" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
 <text x="145" y="55" font-size="18"> 2 </text>
 
-<circle cx="250" cy="50" r="30" stroke="black" stroke-width="3" fill="lightgreen"/>
+<circle cx="250" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
 <text x="245" y="55" font-size="18"> 3 </text>
 
-<circle cx="350" cy="50" r="30" stroke="black" stroke-width="3" fill="lightgreen"/>
+<circle cx="350" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
 <text x="345" y="55" font-size="18"> 4 </text>
 
-<circle cx="250" cy="150" r="30" stroke="black" stroke-width="3" fill="lightgreen"/>
+<circle cx="250" cy="150" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
 <text x="245" y="155" font-size="18"> 5 </text>
 
-<circle cx="350" cy="150" r="30" stroke="black" stroke-width="3" fill="lightgreen"/>
+<circle cx="350" cy="150" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
 <text x="345" y="155" font-size="18"> 6 </text>
 
 <defs>
@@ -25,13 +25,13 @@
 </marker>
 </defs>
 
-<path marker-end='url(#head)' stroke-width='3' stroke='black' d='M80,50 L110,50' />
-<path marker-end='url(#head)' stroke-width='3' stroke='black' d='M180,50 L210,50' />
-<path marker-end='url(#head)' stroke-width='3' stroke='black' d='M280,50 L310,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M80,50 L110,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M180,50 L210,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M280,50 L310,50' />
 
-<path marker-end='url(#head)' stroke-width='3' fill='none' stroke='black' 
+<path marker-end='url(#head)' stroke-width='2' fill='none' stroke='black' 
     d=' M150,80 C150,150 210,150 210,150 ' />
-<path marker-end='url(#head)' stroke-width='3' stroke='black' d='M280,150 L310,150' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M280,150 L310,150' />
 
 </svg>
 

concepts_commits_3.svg

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="600" height="200" >
 
-<circle cx="50" cy="50" r="30" stroke="black" stroke-width="3" fill="lightgreen"/>
+<circle cx="50" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
 <text x="45" y="55" font-size="18"> 1 </text>
 
-<circle cx="150" cy="50" r="30" stroke="black" stroke-width="3" fill="lightgreen"/>
+<circle cx="150" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
 <text x="145" y="55" font-size="18"> 2 </text>
 
-<circle cx="250" cy="50" r="30" stroke="black" stroke-width="3" fill="lightgreen"/>
+<circle cx="250" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
 <text x="245" y="55" font-size="18"> 3 </text>
 
-<circle cx="350" cy="50" r="30" stroke="black" stroke-width="3" fill="lightgreen"/>
+<circle cx="350" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
 <text x="345" y="55" font-size="18"> 4 </text>
 
-<circle cx="450" cy="50" r="30" stroke="black" stroke-width="3" fill="lightgreen"/>
+<circle cx="450" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
 <text x="445" y="55" font-size="18"> 7 </text>
 
-<circle cx="250" cy="150" r="30" stroke="black" stroke-width="3" fill="lightgreen"/>
+<circle cx="250" cy="150" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
 <text x="245" y="155" font-size="18"> 5 </text>
 
-<circle cx="350" cy="150" r="30" stroke="black" stroke-width="3" fill="lightgreen"/>
+<circle cx="350" cy="150" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
 <text x="345" y="155" font-size="18"> 6 </text>
 
 <defs>
@@ -28,15 +28,15 @@
 </marker>
 </defs>
 
-<path marker-end='url(#head)' stroke-width='3' stroke='black' d='M80,50 L110,50' />
-<path marker-end='url(#head)' stroke-width='3' stroke='black' d='M180,50 L210,50' />
-<path marker-end='url(#head)' stroke-width='3' stroke='black' d='M280,50 L310,50' />
-<path marker-end='url(#head)' stroke-width='3' stroke='black' d='M380,50 L410,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M80,50 L110,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M180,50 L210,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M280,50 L310,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M380,50 L410,50' />
 
-<path marker-end='url(#head)' stroke-width='3' fill='none' stroke='black' 
+<path marker-end='url(#head)' stroke-width='2' fill='none' stroke='black' 
     d=' M150,80 C150,150 210,150 210,150 ' />
-<path marker-end='url(#head)' stroke-width='3' stroke='black' d='M280,150 L310,150' />
-<path marker-end='url(#head)' stroke-width='3' fill='none' stroke='black' 
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M280,150 L310,150' />
+<path marker-end='url(#head)' stroke-width='2' fill='none' stroke='black' 
     d=' M380,150 C380,150 450,150 450,90 ' />
 
 </svg>

depot_local_checkout_01.svg

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="600" height="250" >
+
+<g transform="translate(0,80)">
+
+<circle cx="50" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="30" y="55" font-size="18"> 59d... </text>
+
+<circle cx="150" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="130" y="55" font-size="18"> 7b3... </text>
+
+<circle cx="250" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="230" y="55" font-size="18"> 073... </text>
+
+<circle cx="350" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="330" y="55" font-size="18"> ff0... </text>
+
+<circle cx="450" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="430" y="55" font-size="18"> a8b... </text>
+
+<defs>
+<marker id='head' orient="auto" markerWidth='4' markerHeight='8' refX='0.2' refY='3'>
+<path d='M0,0 V6 L3,3 Z' />
+</marker>
+</defs>
+
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M80,50 L110,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M180,50 L210,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M280,50 L310,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M380,50 L410,50' />
+
+<rect x="410" y="-70" width="80" height="40" fill="khaki" stroke-width="2" stroke="black" />
+<text x="425" y="-45" font-size="18"> HEAD </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M450,-30 L450,10' />
+
+<rect x="410" y="120" width="80" height="40" fill="orange" stroke-width="2" stroke="black" />
+<text x="420" y="145" font-size="18"> master </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M450,120 L450,90' />
+
+</g>
+
+</svg>
+

depot_local_checkout_02.svg

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="600" height="250" >
+
+<g transform="translate(0,80)">
+
+<circle cx="50" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="30" y="55" font-size="18"> 59d... </text>
+
+<circle cx="150" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="130" y="55" font-size="18"> 7b3... </text>
+
+<circle cx="250" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="230" y="55" font-size="18"> 073... </text>
+
+<circle cx="350" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="330" y="55" font-size="18"> ff0... </text>
+
+<circle cx="450" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="430" y="55" font-size="18"> a8b... </text>
+
+<defs>
+<marker id='head' orient="auto" markerWidth='4' markerHeight='8' refX='0.2' refY='3'>
+<path d='M0,0 V6 L3,3 Z' />
+</marker>
+</defs>
+
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M80,50 L110,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M180,50 L210,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M280,50 L310,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M380,50 L410,50' />
+
+<rect x="110" y="-70" width="80" height="40" fill="khaki" stroke-width="2" stroke="black" />
+<text x="125" y="-45" font-size="18"> HEAD </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M150,-30 L150,10' />
+
+<rect x="410" y="120" width="80" height="40" fill="orange" stroke-width="2" stroke="black" />
+<text x="420" y="145" font-size="18"> master </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M450,120 L450,90' />
+
+</g>
+
+</svg>
+

depot_local_checkout_03.svg

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="600" height="250" >
+
+<g transform="translate(0,80)">
+
+<circle cx="50" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="30" y="55" font-size="18"> 59d... </text>
+
+<circle cx="150" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="130" y="55" font-size="18"> 7b3... </text>
+
+<circle cx="250" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="230" y="55" font-size="18"> 073... </text>
+
+<circle cx="350" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="330" y="55" font-size="18"> ff0... </text>
+
+<circle cx="450" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="430" y="55" font-size="18"> a8b... </text>
+
+<defs>
+<marker id='head' orient="auto" markerWidth='4' markerHeight='8' refX='0.2' refY='3'>
+<path d='M0,0 V6 L3,3 Z' />
+</marker>
+</defs>
+
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M80,50 L110,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M180,50 L210,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M280,50 L310,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M380,50 L410,50' />
+
+<rect x="110" y="-70" width="80" height="40" fill="khaki" stroke-width="2" stroke="black" />
+<text x="125" y="-45" font-size="18"> HEAD </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M150,-30 L150,10' />
+
+<rect x="110" y="120" width="100" height="40" fill="khaki" stroke-width="2" stroke="black" />
+<text x="120" y="145" font-size="18"> version0 </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M150,120 L150,90' />
+
+<rect x="410" y="120" width="80" height="40" fill="orange" stroke-width="2" stroke="black" />
+<text x="420" y="145" font-size="18"> master </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M450,120 L450,90' />
+
+</g>
+
+</svg>
+

depot_local_checkout_04.svg

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="600" height="250" >
+
+<g transform="translate(0,80)">
+
+<circle cx="50" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="30" y="55" font-size="18"> 59d... </text>
+
+<circle cx="150" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="130" y="55" font-size="18"> 7b3... </text>
+
+<circle cx="250" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="230" y="55" font-size="18"> 073... </text>
+
+<circle cx="350" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="330" y="55" font-size="18"> ff0... </text>
+
+<circle cx="450" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="430" y="55" font-size="18"> a8b... </text>
+
+<defs>
+<marker id='head' orient="auto" markerWidth='4' markerHeight='8' refX='0.2' refY='3'>
+<path d='M0,0 V6 L3,3 Z' />
+</marker>
+</defs>
+
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M80,50 L110,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M180,50 L210,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M280,50 L310,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M380,50 L410,50' />
+
+<rect x="110" y="-70" width="80" height="40" fill="khaki" stroke-width="2" stroke="black" />
+<text x="125" y="-45" font-size="18"> HEAD </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M150,-30 L150,10' />
+
+<rect x="410" y="120" width="80" height="40" fill="orange" stroke-width="2" stroke="black" />
+<text x="420" y="145" font-size="18"> master </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M450,120 L450,90' />
+
+</g>
+
+</svg>
+

depot_local_log.svg

@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="100" >
+<svg xmlns="http://www.w3.org/2000/svg" width="600" height="250" >
 
-<circle cx="50" cy="50" r="30" stroke="black" stroke-width="3" fill="lightgreen"/>
-<text x="35" y="55" font-size="18"> a8... </text>
+<g transform="translate(0,80)">
 
-<circle cx="150" cy="50" r="30" stroke="black" stroke-width="3" fill="lightgreen"/>
-<text x="135" y="55" font-size="18"> ff... </text>
+<circle cx="50" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="30" y="55" font-size="18"> 59d... </text>
 
-<circle cx="250" cy="50" r="30" stroke="black" stroke-width="3" fill="lightgreen"/>
-<text x="235" y="55" font-size="18"> 07... </text>
+<circle cx="150" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="130" y="55" font-size="18"> 7b3... </text>
 
-<circle cx="350" cy="50" r="30" stroke="black" stroke-width="3" fill="lightgreen"/>
-<text x="335" y="55" font-size="18"> 7b... </text>
+<circle cx="250" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="230" y="55" font-size="18"> 073... </text>
 
-<circle cx="450" cy="50" r="30" stroke="black" stroke-width="3" fill="lightgreen"/>
-<text x="435" y="55" font-size="18"> 59... </text>
+<circle cx="350" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="330" y="55" font-size="18"> ff0... </text>
+
+<circle cx="450" cy="50" r="30" stroke="black" stroke-width="2" fill="lightgreen"/>
+<text x="430" y="55" font-size="18"> a8b... </text>
 
 <circle cx="550" cy="50" r="30" stroke="black" stroke-width="2" fill="white"/>
-<text x="535" y="55" font-size="18"> </text>
+<text x="530" y="55" font-size="18"> </text>
 
 <defs>
 <marker id='head' orient="auto" markerWidth='4' markerHeight='8' refX='0.2' refY='3'>
@@ -25,11 +27,21 @@
 </marker>
 </defs>
 
-<path marker-end='url(#head)' stroke-width='3' stroke='black' d='M80,50 L110,50' />
-<path marker-end='url(#head)' stroke-width='3' stroke='black' d='M180,50 L210,50' />
-<path marker-end='url(#head)' stroke-width='3' stroke='black' d='M280,50 L310,50' />
-<path marker-end='url(#head)' stroke-width='3' stroke='black' d='M380,50 L410,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M80,50 L110,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M180,50 L210,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M280,50 L310,50' />
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M380,50 L410,50' />
 <path marker-end='url(#head)' stroke-width='2' stroke='black' d='M480,50 L510,50' />
 
+<rect x="510" y="-70" width="80" height="40" fill="khaki" stroke-width="2" stroke="black" />
+<text x="525" y="-45" font-size="18"> HEAD </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M550,-30 L550,10' />
+
+<rect x="410" y="120" width="80" height="40" fill="orange" stroke-width="2" stroke="black" />
+<text x="420" y="145" font-size="18"> master </text>
+<path marker-end='url(#head)' stroke-width='2' stroke='black' d='M450,120 L450,90' />
+
+</g>
+
 </svg>
 

index.md

@@ -304,34 +304,59 @@ On peut également le voir avec un client graphique graphique comme `gitg`.
 
 Le "unstaged" correspond aux modifications courantes non commitées.
 
-![](depot_local_log.svg)
-
-a8...
-ff...
-07...
-7b...
-59...
+Pour représenter l'historique d'un dépôt, on utilise souvent un graphe où les
+noeuds représentent les commits. On ajoute également l'étiquette "master", qui
+indique le dernier commit principal, et l'étiquette "HEAD", qui indique l'état
+courant du dépôt.
 
-a8b24fd52f55495b07a486a16f684dab25789285
-ff07d510a081863053d27d4107a0da0039c2d2e0
-073437274cb37c7d50afbed20341b76984a8a8a6
-7b3e3b9d501892bdbbfd4c7592221535d9c16399
-59d966459ea11b56464bfa0b23ea85465b3c0bc4
+![](depot_local_log.svg)
 
+Ainsi, un `git commit` créé un commit à partir de l'état pointé par HEAD
+et fait pointer master (et HEAD) sur ce nouveau commit.
 
 ### Supprimer les modifications courantes
 
-### Supprimer des commits précédents
+La commande `git checkout -- . ` supprime les modifications courantes. Le dépôt revient
+alors dans l'état du dernier commit (master).
+
+![](depot_local_checkout_01.svg)
 
 ### Revenir à un commit précédent (sans suppression)
 
+La commande `git checkout 7b3...` permet de revenir au commit "7b3...". On passe 
+ainsi dans un mode "détaché" (HEAD ne pointe plus sur un commit terminal).
 
-TODO
+![](depot_local_checkout_02.svg)
+
+Au lieu d'utiliser le numéro de commit, on peut également utiliser les
+étiquettes. Par exemple, `git checkout master` pour aller au dernier commit
+principal ou `git checkout HEAD~1` pour aller au commit précédent le commit
+courant.
+
+### Marquer un commit
+
+La commande `git tag` permet de nommer des commits pour, par exemple, fixer une
+version ou pouvoir revenir plus facilement sur un commit particulier.
+
+![](depot_local_22.png)
+
+![](depot_local_checkout_03.svg)
+
+### Supprimer des commits précédents
+
+La commande `git reset 073...` revient au commit "073..." et annule tous les
+commits suivant (jusqu'à l'ancien master). Les modifications correspondants à
+ces commits sont conservées dans l'état courant (non commité).
+
+![](depot_local_checkout_04.svg)
 
 
 ### Exercice
 
 
+TODO
+
+
 
 * * * * *