3.6

cdpw_tp1_SERRE_PRUNIER.md

@@ -452,6 +452,53 @@ https://gitlab.isima.fr/mazenovi/2017-F2-Forge
          1 file changed, 4 insertions(+), 4 deletions(-)
         ```
 0. Supprimer les branches de feature et afficher toutes les branches restantes, affichez un historique sous forme de graph (`a dog`) de votre repo `*`
+    ```git
+    clserre1@A210PC12:/h/Documents/cdpw $ git branch --del SERRE_PRUNIER-2.3
+    Deleted branch SERRE_PRUNIER-2.3 (was 939141b).
+    clserre1@A210PC12:/h/Documents/cdpw $ git branch --del SERRE_PRUNIER-3.1
+    Deleted branch SERRE_PRUNIER-3.1 (was 910e2ac).
+    clserre1@A210PC12:/h/Documents/cdpw $ git branch --del SERRE_PRUNIER-3.6
+    Deleted branch SERRE_PRUNIER-3.6 (was 0b24ace).
+    clserre1@A210PC12:/h/Documents/cdpw $ git branch
+    * SERRE_PRUNIER
+      master
+     clserre1@A210PC12:/h/Documents/cdpw $ git log --all --decorate --oneline --graph* f66150b (HEAD -> SERRE_PRUNIER) merge 3.5.iv
+     *   3bcd315 merge 3.5.iv
+     |\
+     | * 0b24ace 3.5.iii
+     * | d921e5e 3.5.iii
+     |/
+     * 0c27449 23.4.ii
+     * 8cf25e6 23.4.i
+     *   984b0f5 Merge branch 'SERRE_PRUNIER-3.3' into SERRE_PRUNIER
+     |\
+     | * 939141b Q2.3.III
+     | * 4695520 Q2.3.II
+     * | 313b711 (master/SERRE_PRUNIER) Q3.3
+     * |   4050489 Q3.1.II - merge error
+     |\ \
+     | * | 910e2ac Q3.1.II
+     * | | e2b7cbf Q3.1.II
+     * | | 87d1e67 Q3.1.II
+     * | | 40028cb Q2.13
+     |/ /
+     * | 665723e Q2.12
+     * | 51905a3 Q2.5
+     |/
+     * a4e6b94 Q2.2
+     * bd03bc0 Q2.1
+     * ef6b3f6 Q1.14
+     | * 9586626 (master) Q2.10
+     |/
+     * 9573e3c Q1.12
+     * 3bd908e Q1.9
+     * b28292b Q1.8
+     * dd449ba Q1.6
+     * 7b7f60f Q1.2
+     clserre1@A210PC12:/h/Documents/cdpw $ git commit -am"3.6"
+     [SERRE_PRUNIER 2546131] 3.6
+      1 file changed, 44 insertions(+)
+    ```
 
 ##### 4. Remote
 0. Afficher l'historique de votre repo