Skip to content
Snippets Groups Projects
Commit 12bae9cc authored by NIDABRAHIM Youssef's avatar NIDABRAHIM Youssef
Browse files

Q2.4.2

parent 71592a8d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 186 additions and 14 deletions
REDA_YOUSSEF.md
+ 186
− 14
View file @ 12bae9cc
......@@ -374,41 +374,213 @@ Changes not staged for commit:
modified: REDA_YOUSSEF.md
no changes added to commit (use "git add" and/or "git commit -a")
```
> On commite cette étape Q2.2
> On commite cette étape Q2.3
```
$ git commit -m "Q2.2"
[reda_youssef 03c3017] Q2.2
2 files changed, 31 insertions(+), 4 deletions(-)
create mode 100644 .gitignore
$ git commit -m "Q2.3"
[reda_youssef 71592a8] Q2.3
1 file changed, 21 insertions(+), 3 deletions(-)
```
0. Créez une branche pour _développer_ la réponse de ce point (nommez là `mybranch-2.4` par exemple)
```
git branch -b reda_youssef_2
$ git branch reda_youssef-2.4
```
0. Afficher un historique sous forme de graph (`a dog`) de votre repo
```
git log --all --graph --decorate --oneline
$ 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
```
0. Pourquoi les 2 branches pointent elles sur la même révision ?`*`
> On remarque que les 2 branches `reda_youssef` et `reda_youssef-2.4` pointent sur la même révision puisque il n'y pas de `commit`
```
$ git add .
$ git commit -m "Q2.4.2"
[reda_youssef 767c502] Q2.4.2
1 file changed, 18 insertions(+), 9 deletions(-)
```
car il y a pas de changement
0. Afficher à nouveau l'historique pour montrer les modifications suite au précédent commit `*`
```
0. Afficher à nouvea l'historique pour montrer les modifications suite au précédent commit `*`
$ git log --graph --abbrev-commit --decorate
* commit 767c502 (HEAD -> reda_youssef)
| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
| Date: Mon Feb 12 22:29:28 2018 +0100
|
| Q2.4.2
|
* commit 71592a8 (reda_youssef-2.4)
| 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
|
| Q2.2
|
* commit 717b390 (master)
| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
| Date: Mon Feb 12 22:14:02 2018 +0100
|
| Q1.15
:...skipping...
* commit 767c502 (HEAD -> reda_youssef)
| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
| Date: Mon Feb 12 22:29:28 2018 +0100
|
| Q2.4.2
|
* commit 71592a8 (reda_youssef-2.4)
| 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
|
| Q2.2
|
* 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
|
| Q1.13
|
* 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
|
| Q1.9
|
* 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
```
git add .
git commit -m "Q2.4.3"
git log --graph --abbrev-commit --decorate
Q1.3
```
> On commite cette étape Q2.4.3
```
$ git add .
$ git commit -m "Q2.4.3"
[reda_youssef a9a2473] Q2.4.3
1 file changed, 86 insertions(+), 2 deletions(-)
```
0. Pourquoi les 2 branches pointent elles sur la même révision ?`*`
> Car il y a pas de changement
```
car il y a pas de changement
$ git add .
$ git commit -m "Q2.4.4"
[reda_youssef f6ac822] Q2.4.4
1 file changed, 8 insertions(+), 3 deletions(-)
```
0. Afficher à nouvea l'historique pour montrer les modifications suite au précédent commit `*`
0. Afficher à nouveau l'historique pour montrer les modifications suite au précédent commit `*`
```
$ git log --graph --abbrev-commit --decorate
* commit f6ac822 (HEAD -> reda_youssef)
| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
| Date: Mon Feb 12 22:35:25 2018 +0100
|
| Q2.4.4
|
* commit a9a2473
| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
| Date: Mon Feb 12 22:32:40 2018 +0100
|
| Q2.4.3
|
* commit 767c502
| Author: NIDABRAHIM Youssef <youssef.nidabrahim@um5s.net.ma>
| Date: Mon Feb 12 22:29:28 2018 +0100
|
| Q2.4.2
|
* commit 71592a8 (reda_youssef-2.4)
| 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
|
| Q2.2
|
* 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
|
| Q1.13
|
* 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
|
| Q1.9
|
* 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
Q1.3
```
0. Revenir la brache `mybranch`
```
git checkout reda_youssef
```
0. Où sont passé vos reponces au point 2.4 ? `*`
```
git add .
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment