From 3dd370843766c86651faa5fc09dfb484cbb8b425 Mon Sep 17 00:00:00 2001
From: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
Date: Mon, 12 Feb 2018 23:03:02 +0100
Subject: [PATCH] Q2.4.3
---
REDA_YOUSSEF.md | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/REDA_YOUSSEF.md b/REDA_YOUSSEF.md
index 527a9d1..e4d2d35 100644
--- a/REDA_YOUSSEF.md
+++ b/REDA_YOUSSEF.md
@@ -397,7 +397,6 @@ $ git log --all --graph --decorate --oneline
* a38f03f Q1.9
* abfd2d9 Q1.7
* 3ec344e Q1.3
-
```
0. Pourquoi les 2 branches pointent elles sur la même révision ?`*`
@@ -405,20 +404,20 @@ $ git log --all --graph --decorate --oneline
```
$ git add .
$ git commit -m "Q2.4.2"
-[reda_youssef 767c502] Q2.4.2
- 1 file changed, 18 insertions(+), 9 deletions(-)
+[reda_youssef-2.4 12bae9c] Q2.4.2
+ 1 file changed, 186 insertions(+), 14 deletions(-)
```
0. Afficher à nouveau l'historique pour montrer les modifications suite au précédent commit `*`
```
$ git log --graph --abbrev-commit --decorate
-* commit 767c502 (HEAD -> reda_youssef)
+* commit 12bae9c (HEAD -> reda_youssef-2.4)
| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 22:29:28 2018 +0100
+| Date: Mon Feb 12 23:00:27 2018 +0100
|
| Q2.4.2
|
-* commit 71592a8 (reda_youssef-2.4)
+* commit 71592a8 (reda_youssef)
| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
| Date: Mon Feb 12 22:21:41 2018 +0100
|
@@ -436,13 +435,13 @@ $ git log --all --graph --decorate --oneline
|
| Q1.15
:...skipping...
-* commit 767c502 (HEAD -> reda_youssef)
+* commit 12bae9c (HEAD -> reda_youssef-2.4)
| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 22:29:28 2018 +0100
+| Date: Mon Feb 12 23:00:27 2018 +0100
|
| Q2.4.2
|
-* commit 71592a8 (reda_youssef-2.4)
+* commit 71592a8 (reda_youssef)
| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
| Date: Mon Feb 12 22:21:41 2018 +0100
|
@@ -487,9 +486,9 @@ $ git log --all --graph --decorate --oneline
* commit 3ec344e
Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
Date: Mon Feb 12 21:02:43 2018 +0100
- ```
Q1.3
-```
+ ```
+ ```
> On commite cette étape Q2.4.3
```
$ git add .
--
GitLab