From 5baabf9771c06c2b68d2535fd09a88a7c5b1f019 Mon Sep 17 00:00:00 2001
From: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
Date: Tue, 13 Feb 2018 00:36:06 +0100
Subject: [PATCH] Q3.7
---
REDA_YOUSSEF.md | 616 +++++++++++++++++++++++++++---------------------
1 file changed, 347 insertions(+), 269 deletions(-)
diff --git a/REDA_YOUSSEF.md b/REDA_YOUSSEF.md
index 31ac8e2..5832c9a 100644
--- a/REDA_YOUSSEF.md
+++ b/REDA_YOUSSEF.md
@@ -220,23 +220,22 @@ index 26d82fc..50663bf 100644
+++ b/REDA_YOUSSEF.md
@@ -147,14 +147,70 @@ Use -f if you really want to add them.
```
- > On commite cette étape Q1.13
- ```
--git commit -m "Q1.13"
-+$ git commit -m "Q1.13"
-+[master 715a4ee] Q1.13
-+ 1 file changed, 26 insertions(+), 6 deletions(-)
- ```
-+
- 0. Lister le contenu du repertoire courant, afficher le status et la log
+ > On commite cette étape Q1.15
+```
+$ git commit -m "Q1.15"
+$ git commit -m "Q1.15"
+[master 715a4ee] Q1.15
+ 1 file changed, 26 insertions(+), 6 deletions(-)
+```
+
+0. Lister le contenu du repertoire courant, afficher le status et la log
```
--git ls-files
--git status
--git log
-+$ git ls-files
-+REDA_YOUSSEF.md
-+start
-+```
+$ git ls-files
+REDA_YOUSSEF.md
+start
+```
+```
+$ git log
:...skipping...
diff --git a/REDA_YOUSSEF.md b/REDA_YOUSSEF.md
index 26d82fc..50663bf 100644
@@ -244,77 +243,74 @@ index 26d82fc..50663bf 100644
+++ b/REDA_YOUSSEF.md
@@ -147,14 +147,70 @@ Use -f if you really want to add them.
```
- > On commite cette étape Q1.13
+ > On commite cette étape Q1.16
```
--git commit -m "Q1.13"
-+$ git commit -m "Q1.13"
-+[master 715a4ee] Q1.13
-+ 1 file changed, 26 insertions(+), 6 deletions(-)
+git commit -m "Q1.16"
+$ git commit -m "Q1.16"
+[master 715a4ee] Q1.16
+ 1 file changed, 26 insertions(+), 6 deletions(-)
```
-+
- 0. Lister le contenu du repertoire courant, afficher le status et la log
+
+0. Lister le contenu du repertoire courant, afficher le status et la log
```
--git ls-files
--git status
--git log
-+$ git ls-files
-+REDA_YOUSSEF.md
-+start
-+```
-+```
-+$ git status
-+On branch master
-+Changes not staged for commit:
-+ (use "git add <file>..." to update what will be committed)
-+ (use "git checkout -- <file>..." to discard changes in working directory)
-+ modified: REDA_YOUSSEF.md
-+Untracked files:
-+ (use "git add <file>..." to include in what will be committed)
-+ .gitignore
-+no changes added to commit (use "git add" and/or "git commit -a")
-+```
+$ git ls-files
+REDA_YOUSSEF.md
+start
+```
+```
+$ git status
+On branch master
+Changes not staged for commit:
+ (use "git add <file>..." to update what will be committed)
+ (use "git checkout -- <file>..." to discard changes in working directory)
+ modified: REDA_YOUSSEF.md
+Untracked files:
+ (use "git add <file>..." to include in what will be committed)
+ .gitignore
+no changes added to commit (use "git add" and/or "git commit -a")
+```
```
-+$ git log
-+commit 715a4ee8285da57cd0debd02ef0d2756d7e9408a
-+Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-+Date: Mon Feb 12 22:05:17 2018 +0100
-+ Q1.13
-+commit 51a5addb0f97faae02a4e72054fb4af151e41fd5
-+Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-+Date: Mon Feb 12 21:53:17 2018 +0100
-+ Q1.10
-+commit a38f03f0e4779c9aec92bd1bd6dce92c18f03723
-+Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-+Date: Mon Feb 12 21:40:41 2018 +0100
-+ Q1.9
-+commit abfd2d91c6fff3d02fd132e77c012cc695b2ec84
-+Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-+Date: Mon Feb 12 21:15:48 2018 +0100
-+ Q1.7
-+:...skipping...
-+commit 715a4ee8285da57cd0debd02ef0d2756d7e9408a
-+Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-+Date: Mon Feb 12 22:05:17 2018 +0100
-+ Q1.13
-+commit 51a5addb0f97faae02a4e72054fb4af151e41fd5
-+Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-+Date: Mon Feb 12 21:53:17 2018 +0100
-+ Q1.10
-+commit a38f03f0e4779c9aec92bd1bd6dce92c18f03723
-+Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-+Date: Mon Feb 12 21:40:41 2018 +0100
-+ Q1.9
-+commit abfd2d91c6fff3d02fd132e77c012cc695b2ec84
-+Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-+Date: Mon Feb 12 21:15:48 2018 +0100
-+ Q1.7
-+commit 3ec344ecfd24df41ca97396f27b52ec570297ce3
-+Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-+Date: Mon Feb 12 21:02:43 2018 +0100
-+ Q1.3
-+```
-+
- 0. Avant de commiter affichez les modifications par rapport à la précédente révision ? `*`
+$ git log
+commit 715a4ee8285da57cd0debd02ef0d2756d7e9408a
+Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+Date: Mon Feb 12 22:05:17 2018 +0100
+ Q1.13
+commit 51a5addb0f97faae02a4e72054fb4af151e41fd5
+Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+Date: Mon Feb 12 21:53:17 2018 +0100
+ Q1.10
+commit a38f03f0e4779c9aec92bd1bd6dce92c18f03723
+Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+Date: Mon Feb 12 21:40:41 2018 +0100
+ Q1.9
+commit abfd2d91c6fff3d02fd132e77c012cc695b2ec84
+Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+Date: Mon Feb 12 21:15:48 2018 +0100
+ Q1.7
+:...skipping...
+commit 715a4ee8285da57cd0debd02ef0d2756d7e9408a
+Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+Date: Mon Feb 12 22:05:17 2018 +0100
+ Q1.13
+commit 51a5addb0f97faae02a4e72054fb4af151e41fd5
+Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+Date: Mon Feb 12 21:53:17 2018 +0100
+ Q1.10
+commit a38f03f0e4779c9aec92bd1bd6dce92c18f03723
+Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+Date: Mon Feb 12 21:40:41 2018 +0100
+ Q1.9
+commit abfd2d91c6fff3d02fd132e77c012cc695b2ec84
+Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+Date: Mon Feb 12 21:15:48 2018 +0100
+ Q1.7
+commit 3ec344ecfd24df41ca97396f27b52ec570297ce3
+Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+Date: Mon Feb 12 21:02:43 2018 +0100
+ Q1.3
+```
+
+0. Avant de commiter affichez les modifications par rapport à la précédente révision ? `*`
```
git diff
```
@@ -324,10 +320,10 @@ The following paths are ignored by one of your .gitignore files:
file2ignore
Use -f if you really want to add them.
```
- > On commite cette étape Q1.15
+ > On commite cette étape Q1.18
```
-$ git commit -m "Q1.15"
-[master 717b390] Q1.15
+$ git commit -m "Q1.18"
+[master 717b390] Q1.18
1 file changed, 168 insertions(+), 5 deletions(-)
```
@@ -344,7 +340,7 @@ M REDA_YOUSSEF.md
```
$ git branch
master
-* reda_youssef
+ *reda_youssef
```
```
$ git ls-files
@@ -363,7 +359,7 @@ $ git commit -m "Q2.2"
2 files changed, 31 insertions(+), 4 deletions(-)
create mode 100644 .gitignore
```
-
+
0. Afficher le status de votre repo `*`
```
$ git status
@@ -389,14 +385,14 @@ $ git commit -m "Q2.3"
0. Afficher un historique sous forme de graph (`a dog`) de votre repo
```
$ git log --all --graph --decorate --oneline
-* 71592a8 (HEAD -> reda_youssef-2.4, reda_youssef) Q2.3
-* 03c3017 Q2.2
-* 717b390 (master) Q1.15
-* 715a4ee Q1.13
-* 51a5add Q1.10
-* a38f03f Q1.9
-* abfd2d9 Q1.7
-* 3ec344e Q1.3
+*71592a8 (HEAD -> reda_youssef-2.4, reda_youssef) Q2.3
+*03c3017 Q2.2
+*717b390 (master) Q1.15
+*715a4ee Q1.13
+*51a5add Q1.10
+*a38f03f Q1.9
+*abfd2d9 Q1.7
+*3ec344e Q1.3
```
0. Pourquoi les 2 branches pointent elles sur la même révision ?`*`
@@ -411,83 +407,82 @@ $ git log --all --graph --decorate --oneline
0. Afficher à nouveau l'historique pour montrer les modifications suite au précédent commit `*`
```
$ git log --graph --abbrev-commit --decorate
-* commit 12bae9c (HEAD -> reda_youssef-2.4)
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 23:00:27 2018 +0100
+*commit 12bae9c (HEAD -> reda_youssef-2.4)
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 23:00:27 2018 +0100
|
| Q2.4.2
|
-* commit 71592a8 (reda_youssef)
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 22:21:41 2018 +0100
+*commit 71592a8 (reda_youssef)
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 22:21:41 2018 +0100
|
| Q2.3
|
-* commit 03c3017
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 22:19:47 2018 +0100
+*commit 03c3017
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 22:19:47 2018 +0100
|
| Q2.2
|
-* commit 717b390 (master)
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 22:14:02 2018 +0100
+*commit 717b390 (master)
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 22:14:02 2018 +0100
|
| Q1.15
:...skipping...
-* commit 12bae9c (HEAD -> reda_youssef-2.4)
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 23:00:27 2018 +0100
+*commit 12bae9c (HEAD -> reda_youssef-2.4)
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 23:00:27 2018 +0100
|
| Q2.4.2
|
-* commit 71592a8 (reda_youssef)
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 22:21:41 2018 +0100
+*commit 71592a8 (reda_youssef)
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 22:21:41 2018 +0100
|
| Q2.3
|
-* commit 03c3017
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 22:19:47 2018 +0100
+*commit 03c3017
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 22:19:47 2018 +0100
|
| Q2.2
|
-* commit 717b390 (master)
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 22:14:02 2018 +0100
+*commit 717b390 (master)
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 22:14:02 2018 +0100
|
| Q1.15
|
-* commit 715a4ee
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 22:05:17 2018 +0100
+*commit 715a4ee
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 22:05:17 2018 +0100
|
| Q1.13
|
-* commit 51a5add
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 21:53:17 2018 +0100
+*commit 51a5add
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 21:53:17 2018 +0100
|
| Q1.10
|
-* commit a38f03f
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 21:40:41 2018 +0100
+*commit a38f03f
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 21:40:41 2018 +0100
|
| Q1.9
|
-* commit abfd2d9
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 21:15:48 2018 +0100
+*commit abfd2d9
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 21:15:48 2018 +0100
|
| Q1.7
|
-* commit 3ec344e
- Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
- Date: Mon Feb 12 21:02:43 2018 +0100
+*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
```
@@ -509,92 +504,92 @@ $ git commit -m "Q2.4.4"
0. Afficher à nouveau l'historique pour montrer les modifications suite au précédent commit `*`
```
$ git log --graph --abbrev-commit --decorate
-* commit d72c9c1 (HEAD -> reda_youssef-2.4)
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 23:04:18 2018 +0100
+*commit d72c9c1 (HEAD -> reda_youssef-2.4)
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 23:04:18 2018 +0100
|
| Q2.4.4
|
-* commit 3dd3708
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 23:03:02 2018 +0100
+*commit 3dd3708
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 23:03:02 2018 +0100
|
| Q2.4.3
|
-* commit 12bae9c
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 23:00:27 2018 +0100
+*commit 12bae9c
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 23:00:27 2018 +0100
|
| Q2.4.2
|
-* commit 71592a8 (reda_youssef)
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 22:21:41 2018 +0100
+*commit 71592a8 (reda_youssef)
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 22:21:41 2018 +0100
|
| Q2.3
:...skipping...
-* commit d72c9c1 (HEAD -> reda_youssef-2.4)
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 23:04:18 2018 +0100
+*commit d72c9c1 (HEAD -> reda_youssef-2.4)
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 23:04:18 2018 +0100
|
| Q2.4.4
|
-* commit 3dd3708
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 23:03:02 2018 +0100
+*commit 3dd3708
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 23:03:02 2018 +0100
|
| Q2.4.3
|
-* commit 12bae9c
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 23:00:27 2018 +0100
+*commit 12bae9c
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 23:00:27 2018 +0100
|
| Q2.4.2
|
-* commit 71592a8 (reda_youssef)
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 22:21:41 2018 +0100
+*commit 71592a8 (reda_youssef)
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 22:21:41 2018 +0100
|
| Q2.3
|
-* commit 03c3017
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 22:19:47 2018 +0100
+*commit 03c3017
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 22:19:47 2018 +0100
|
| Q2.2
|
-* commit 717b390 (master)
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 22:14:02 2018 +0100
+*commit 717b390 (master)
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 22:14:02 2018 +0100
|
| Q1.15
|
-* commit 715a4ee
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 22:05:17 2018 +0100
+*commit 715a4ee
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 22:05:17 2018 +0100
|
| Q1.13
|
-* commit 51a5add
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 21:53:17 2018 +0100
+*commit 51a5add
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 21:53:17 2018 +0100
|
| Q1.10
|
-* commit a38f03f
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 21:40:41 2018 +0100
+*commit a38f03f
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 21:40:41 2018 +0100
|
| Q1.9
|
-* commit abfd2d9
-| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
-| Date: Mon Feb 12 21:15:48 2018 +0100
+*commit abfd2d9
+|Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+|Date: Mon Feb 12 21:15:48 2018 +0100
|
| Q1.7
|
-* commit 3ec344e
- Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
+*commit 3ec344e
+ Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
Date: Mon Feb 12 21:02:43 2018 +0100
Q1.3
(END)
@@ -625,22 +620,22 @@ $ git commit -m "Q2.6"
0. Affichez un historique sous forme de graph (`a dog`) de votre repo, Que peux ton en dire ?
```
$ git log --all --graph --decorate --oneline
-* 30c07dd (HEAD -> reda_youssef) Q2.6
-| * 02a31d5 (reda_youssef-2.4) Q2.4.5
-| * d72c9c1 Q2.4.4
-| * 3dd3708 Q2.4.3
-| * 12bae9c Q2.4.2
+*30c07dd (HEAD -> reda_youssef) Q2.6
+| *02a31d5 (reda_youssef-2.4) Q2.4.5
+| *d72c9c1 Q2.4.4
+| *3dd3708 Q2.4.3
+| *12bae9c Q2.4.2
|/
-* 71592a8 Q2.3
-* 03c3017 Q2.2
-* 717b390 (master) Q1.15
-* 715a4ee Q1.13
-* 51a5add Q1.10
-* a38f03f Q1.9
-* abfd2d9 Q1.7
-* 3ec344e Q1.3
+*71592a8 Q2.3
+*03c3017 Q2.2
+*717b390 (master) Q1.15
+*715a4ee Q1.13
+*51a5add Q1.10
+*a38f03f Q1.9
+*abfd2d9 Q1.7
+*3ec344e Q1.3
```
- > **NOTE:** D'après le graphe, on remarque bien les commites effectuer dans la branche `reda_youssef-2.4`
+ > **NOTE:** D'après le graphe, on remarque bien les commites effectuer dans la branche `reda_youssef-2.4`
0. Revenir sur la branche master
```
@@ -668,24 +663,24 @@ $ git commit -m "Q2.10"
0. Affichez un historique sous forme de graph (`a dog`) de votre repo `*`
```
$ git log --all --graph --decorate --oneline
-* ca0e5da (HEAD -> reda_youssef) Q2.10
-* f50a0e6 Q2.6
-| * b2acb20 (master) Q2.9
-| | * 02a31d5 (reda_youssef-2.4) Q2.4.5
-| | * d72c9c1 Q2.4.4
-| | * 3dd3708 Q2.4.3
-| | * 12bae9c Q2.4.2
+*ca0e5da (HEAD -> reda_youssef) Q2.10
+*f50a0e6 Q2.6
+| *b2acb20 (master) Q2.9
+| | *02a31d5 (reda_youssef-2.4) Q2.4.5
+| | *d72c9c1 Q2.4.4
+| | *3dd3708 Q2.4.3
+| | *12bae9c Q2.4.2
| |/
|/|
-* | 71592a8 Q2.3
-* | 03c3017 Q2.2
+*|71592a8 Q2.3
+*|03c3017 Q2.2
|/
-* 717b390 Q1.15
-* 715a4ee Q1.13
-* 51a5add Q1.10
-* a38f03f Q1.9
-* abfd2d9 Q1.7
-* 3ec344e Q1.3
+*717b390 Q1.15
+*715a4ee Q1.13
+*51a5add Q1.10
+*a38f03f Q1.9
+*abfd2d9 Q1.7
+*3ec344e Q1.3
```
> On commite cette étape Q2.11
```
@@ -743,9 +738,9 @@ no changes added to commit (use "git add" and/or "git commit -a")
```
0. Pourquoi n'y a t'il aucune modification en cours ? `*`
- > Normalement, on n'aura pas de modification à commiter après un merge puisqu'ils sont déjà commiter dans la branche `rda_youssef-3.1`
+ > Normalement, on n'aura pas de modification à commiter après un merge puisqu'ils sont déjà commiter dans la branche `reda_youssef-3.1`
```
-£ git add .
+$ git add .
$ git commit -m "Q3.3"
[reda_youssef b73a302] Q3.3
1 file changed, 21 insertions(+), 5 deletions(-)
@@ -754,27 +749,27 @@ $ git commit -m "Q3.3"
0. Affichez un historique sous forme de graph (`a dog`) de votre repo et décire l'état courant`*`
```
$ git log --all --graph --decorate --oneline
-* b73a302 (HEAD -> reda_youssef) Q3.3
-* 4a165c0 (reda_youssef-3.1) Q3.1.2
-* f258f21 Q2.11
-* ca0e5da Q2.10
-* f50a0e6 Q2.6
-| * b2acb20 (master) Q2.9
-| | * 02a31d5 (reda_youssef-2.4) Q2.4.5
-| | * d72c9c1 Q2.4.4
-| | * 3dd3708 Q2.4.3
-| | * 12bae9c Q2.4.2
+*b73a302 (HEAD -> reda_youssef) Q3.3
+*4a165c0 (reda_youssef-3.1) Q3.1.2
+*f258f21 Q2.11
+*ca0e5da Q2.10
+*f50a0e6 Q2.6
+| *b2acb20 (master) Q2.9
+| | *02a31d5 (reda_youssef-2.4) Q2.4.5
+| | *d72c9c1 Q2.4.4
+| | *3dd3708 Q2.4.3
+| | *12bae9c Q2.4.2
| |/
|/|
-* | 71592a8 Q2.3
-* | 03c3017 Q2.2
+*|71592a8 Q2.3
+*|03c3017 Q2.2
|/
-* 717b390 Q1.15
-* 715a4ee Q1.13
-* 51a5add Q1.10
-* a38f03f Q1.9
-* abfd2d9 Q1.7
-* 3ec344e Q1.3
+*717b390 Q1.15
+*715a4ee Q1.13
+*51a5add Q1.10
+*a38f03f Q1.9
+*abfd2d9 Q1.7
+*3ec344e Q1.3
```
> **NOTE:** On voit clairement que les commites de la branche `reda_youssef-3.1` sont ajouter à notre branche `reda_youssef`
```
@@ -804,30 +799,30 @@ Merge made by the 'recursive' strategy.
0. Affichez un historique sous forme de graph (`a dog`) de votre repo `*`
```
$ git log --all --graph --decorate --oneline
-* 04680c8 (HEAD -> reda_youssef) Q3.5.1
-* 563d694 Merge branch 'reda_youssef-2.4' into reda_youssef
+*04680c8 (HEAD -> reda_youssef) Q3.5.1
+*563d694 Merge branch 'reda_youssef-2.4' into reda_youssef
|\
-| * 02a31d5 (reda_youssef-2.4) Q2.4.5
-| * d72c9c1 Q2.4.4
-| * 3dd3708 Q2.4.3
-| * 12bae9c Q2.4.2
-* | cbc5756 Q3.4
-* | b73a302 Q3.3
-* | 4a165c0 (reda_youssef-3.1) Q3.1.2
-* | f258f21 Q2.11
-* | ca0e5da Q2.10
-* | f50a0e6 Q2.6
+| *02a31d5 (reda_youssef-2.4) Q2.4.5
+| *d72c9c1 Q2.4.4
+| *3dd3708 Q2.4.3
+| *12bae9c Q2.4.2
+.* |cbc5756 Q3.4
+.* |b73a302 Q3.3
+.* |4a165c0 (reda_youssef-3.1) Q3.1.2
+.* |f258f21 Q2.11
+.* |ca0e5da Q2.10
+.* |f50a0e6 Q2.6
|/
-* 71592a8 Q2.3
-* 03c3017 Q2.2
-| * b2acb20 (master) Q2.9
+*71592a8 Q2.3
+*03c3017 Q2.2
+| *b2acb20 (master) Q2.9
|/
-* 717b390 Q1.15
-* 715a4ee Q1.13
-* 51a5add Q1.10
-* a38f03f Q1.9
-* abfd2d9 Q1.7
-* 3ec344e Q1.3
+*717b390 Q1.15
+*715a4ee Q1.13
+*51a5add Q1.10
+*a38f03f Q1.9
+*abfd2d9 Q1.7
+*3ec344e Q1.3
```
> On commite cette étape Q3.5.2
```
@@ -844,7 +839,7 @@ Merge made by the 'recursive' strategy.
Created a new branch 'reda_youssef-3.6'
M REDA_YOUSSEF.md
```
-
+
0. Notez dans le CR la date et l'heure actuelle (avec la commande `date` par exemple) `*`
```
$ date >> REDA_YOUSSEF.md
@@ -880,40 +875,123 @@ Auto-merging REDA_YOUSSEF.md
CONFLICT (content): Merge conflict in REDA_YOUSSEF.md
Automatic merge failed; fix conflicts and then commit the result.
```
- > **NOTE: ** Le prompt change puisque les deux branches ont modifié la même chose
+ > **NOTE:** Le prompt change puisque les deux branches ont modifié la même chose
+ ```
+$ git add .
+$ git commit -m "Q3.6.4"
+[reda_youssef eef8621] Q3.6.4
+```
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 branch -D reda_youssef_2
- git branch -D reda_youssef_3
- git branch -D reda_youssef_3.6
- git log --all --graph --decorate --oneline
+ $ git branch -d reda_youssef-3.6
+Deleted branch reda_youssef-3.6 (was 25af935).
+ $ git branch -d reda_youssef-3.1
+Deleted branch reda_youssef-3.1 (was 4a165c0).
+ $ git branch -d reda_youssef-2.4
+Deleted branch reda_youssef-2.4 (was 02a31d5).
+```
+```
+$ git log --all --graph --decorate --oneline
+*eef8621 (HEAD -> reda_youssef) Q3.6.4
+|\
+| *25af935 Q3.6.3
+.* |28c47b8 Q3.6.2
+|/
+*1c24ed3 Q3.5.2
+*04680c8 Q3.5.1
+*563d694 Merge branch 'reda_youssef-2.4' into reda_youssef
+|\
+| *02a31d5 Q2.4.5
+| *d72c9c1 Q2.4.4
+| *3dd3708 Q2.4.3
+| *12bae9c Q2.4.2
+.* |cbc5756 Q3.4
+.* |b73a302 Q3.3
+.* |4a165c0 Q3.1.2
+.* |f258f21 Q2.11
+.* |ca0e5da Q2.10
+.* |f50a0e6 Q2.6
+|/
+*71592a8 Q2.3
+*03c3017 Q2.2
+| *b2acb20 (master) Q2.9
+|/
+*717b390 Q1.15
+*715a4ee Q1.13
+*51a5add Q1.10
+*a38f03f Q1.9
+*abfd2d9 Q1.7
+*3ec344e Q1.3
+```
+ > On commite cette étape Q3.7
+```
+$ git add .
+$ git commit -m "Q3.7"
+[reda_youssef 914b6e2] Q3.7
+ 1 file changed, 47 insertions(+), 4 deletions(-)
```
##### 4. Remote
0. Afficher l'historique de votre repo
```
-git log --all --graph --decorate --oneline
+$ git log --all --graph --decorate --oneline
+*3732bd6 (HEAD -> reda_youssef) Q3.7
+*eef8621 Q3.6.4
+|\
+| *25af935 Q3.6.3
+.* |28c47b8 Q3.6.2
+|/
+*1c24ed3 Q3.5.2
+*04680c8 Q3.5.1
+*563d694 Merge branch 'reda_youssef-2.4' into reda_youssef
+|\
+| *02a31d5 Q2.4.5
+| *d72c9c1 Q2.4.4
+| *3dd3708 Q2.4.3
+| *12bae9c Q2.4.2
+.* |cbc5756 Q3.4
+.* |b73a302 Q3.3
+.* |4a165c0 Q3.1.2
+.* |f258f21 Q2.11
+.* |ca0e5da Q2.10
+.* |f50a0e6 Q2.6
+|/
+*71592a8 Q2.3
+*03c3017 Q2.2
+| *b2acb20 (master) Q2.9
+|/
+*717b390 Q1.15
+*715a4ee Q1.13
+*51a5add Q1.10
+*a38f03f Q1.9
+*abfd2d9 Q1.7
+*3ec344e Q1.3
```
+
0. Ajouter le projet "2017-F2-Forge" comme repository distant `*`
```
-git remote add origin https://mobenchraa@gitlab.isima.fr/mazenovi/2017-F2-Forge.git
-git add .
-git commit -m
+$ git remote add origin https://mobenchraa@gitlab.isima.fr/mazenovi/2017-F2-Forge.git
```
-0. Lister les branches distantes
+ > On commite cette étape Q4.2
```
-git remote show https://mobenchraa@gitlab.isima.fr/mazenovi/2017-F2-Forge.git
+$ git add .
+$ git commit -m "Q4.2"
```
-0. Pousser votre branche de votre repo local sur le repos distant `*`
+
+0. Lister les branches distantes
```
-git add .
-git commit -m
-git push origin reda_youssef
+$ git remote show https://mobenchraa@gitlab.isima.fr/mazenovi/2017-F2-Forge.git
```
-0. En consultant votre branche sous gitlab, vous devriez constaté que la date de modification du fichier start est plus acienne que celle de votre compte rendu, porquoi alors que le push de toute votre branche est faite en une seule fois ?
+
+0. Pousser votre branche de votre repo local sur le repos distant `*`
```
-git trace les modifications et pas les fichiers
+$ git add .
+$ git commit -m "Q4.4"
+$ git push origin reda_youssef
```
+0. En consultant votre branche sous gitlab, vous devriez constaté que la date de modification du fichier start est plus acienne que celle de votre compte rendu, pourquoi alors que le push de toute votre branche est faite en une seule fois ?
+ > Avec git, les fichiers ne sont jamais tracé mais plutôt leurs modifications
+
0. Supprimer le dossier .git
-0. Faire un git status ?
\ No newline at end of file
+0. Faire un git status ?
--
GitLab