diff --git a/REDA_YOUSSEF.md b/REDA_YOUSSEF.md index ae669d9b0a0cf2f766449f7b237d2a7f566e3c14..586fe9cd3ed66bd0019a61c1f79ae3dec7a282ef 100644 --- a/REDA_YOUSSEF.md +++ b/REDA_YOUSSEF.md @@ -374,37 +374,239 @@ 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-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 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 +| +| 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 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 +| +| 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 + ``` + ``` + > On commite cette étape Q2.4.3 +``` + $ git add . + $ git commit -m "Q2.4.3" +[reda_youssef-2.4 3dd3708] Q2.4.3 + 1 file changed, 10 insertions(+), 11 deletions(-) ``` - car il y a pas de changement - ``` - 0. Afficher à nouvea l'historique pour montrer les modifications suite au précédent commit `*` - ``` - git add . - git commit -m "Q2.4.3" - git log --graph --abbrev-commit --decorate - ``` + 0. Pourquoi les 2 branches pointent elles sur la même révision ?`*` + > Car il n'y a pas de changement ``` - car il y a pas de changement + $ git add . +$ git commit -m "Q2.4.4" +[reda_youssef-2.4 d72c9c1] Q2.4.4 + 1 file changed, 3 insertions(+), 3 deletions(-) + ``` + + 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 +| +| Q2.4.4 +| +* 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 +| +| Q2.4.2 +| +* 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 +| +| Q2.4.4 +| +* 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 +| +| Q2.4.2 +| +* 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 +| +| 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 +(END) +``` + > On commite cette étape Q2.4.5 ``` - 0. Afficher à nouvea l'historique pour montrer les modifications suite au précédent commit `*` +$ git add . +$ git commit -m "Q2.4.5" +[reda_youssef-2.4 f94d5dd] Q2.4.5 + 1 file changed, 41 insertions(+), 10 deletions(-) +``` + 0. Revenir la brache `mybranch` ``` $ git checkout reda_youssef