From d3ae5023242577c22882f9d0ad8610abeda54c1f Mon Sep 17 00:00:00 2001 From: Safa Said Date: Fri, 6 Oct 2017 08:24:13 +0100 Subject: [PATCH 01/19] fix #4 --- dummy.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dummy.txt b/dummy.txt index bc5942c..9c8be01 100644 --- a/dummy.txt +++ b/dummy.txt @@ -1 +1 @@ -Ceci est un text qui contien des phautes \ No newline at end of file +Ceci est un text qui contient des fautes From a051795d8685bbe486e0614fe057bfa7c76c78af Mon Sep 17 00:00:00 2001 From: Duyck Adrien Date: Fri, 6 Oct 2017 08:43:16 +0100 Subject: [PATCH 02/19] Features : close 6 --- InitDepot.txt | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 InitDepot.txt diff --git a/InitDepot.txt b/InitDepot.txt new file mode 100644 index 0000000..bd89945 --- /dev/null +++ b/InitDepot.txt @@ -0,0 +1,27 @@ +## Titre : Les commandes principales pour créer un dépôt GIT + + +# Créer un nouveau dépôt : +git init +# ex : git init dep_toto + +# Cloner un dépôt existant +git clone +# ex : git clone git@github.com:formationgit102017/git-training-2.git + +# Afficher les branches +git branch -a + +# Changer de branche +git checkout + +# Créer une branche +git branch + +# Afficher l'état d'un dépôt +git status + +# Afficher les logs du dépôt +git log + +Et pour le reste aller sur le lien suivant : http://192.168.94.250:8080/resources/initiationgit.pdf \ No newline at end of file From 28ac8c4434ab5fb721776b401347a27448e2e09a Mon Sep 17 00:00:00 2001 From: Carine NIVELET Date: Fri, 6 Oct 2017 09:37:41 +0100 Subject: [PATCH 03/19] close#10 ajout fichier Photo.jpg --- Photo.jpg | Bin 0 -> 11779 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Photo.jpg diff --git a/Photo.jpg b/Photo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..18c03df7227027a0beca4ca094184bd62916aa2d GIT binary patch literal 11779 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

YO+F@{_=lX33 zaFlC^Ygd=*xhL<;Do9{4w$DS^ajnSrUgCnJPa2tbsa?v&WU7W&v-fkF8^LX+RtWSO zNeWQ#2z3m&YG>(=?Zt69KI_~91@mB@NLJv}J{6CNpC4ww2i80UR8?&dp#0IDA<8TW zACyXSs7|(Fo()ajT;R+1V+=*R3O;I$q%LrQsfhF586!2mj{nV0!$9%c;(VcoR4fOz zZ=U;}qB@tDlhHvHV#zw|KbLOkBhzjr^h{5piVI*jOV>XW1)7x*+LD3+FKkF$%~+ z)lB08s1PRt7%++war6ziw1=3vX0d)k!P^^a_s}yFcS;#a6geX?1EGTw#wt&dXfTFO zK85G(QAPx9 zNW38ThI|I8eg$#tO&GADq8&3ZbqR2KoyX}x9}=)YDSMWwxH;?90>thlGI=Et0_ifU`4ZX zMZB@)!Rj!1J(@Tt!0#0sTo9CRC%K7L*hEuj-41LG0l(0eGi7g{uW)AUI)powF1s-U zbvA=!p($#&WHZi$uYXaS#f(VWc3A8C_U`TSK+3)B5TCkPYaLj9!xs30@z~C=T3Vfzzg9qwGgA3U*SXsjyBd}}*xWoz6NU95}LBDj&GU{#-J zR)ZWWZUlFB&qKhSuUQ3`7; z+4FVaO~D*vi(eNDgo1gCT^}VrmXjX!Bby8e4)&4c_HV+?U%5l5Xryt|%t{dGEQTl` zA%{8)d;i>?e-{>301#aaH{9Nel^CIp?> zy~q-i1w+>^0LY4AZhieUgQ3vPNngt@RXE89z*1G1tR|3~34Zc7ZOJG^A6uPo$$&wT zP*nW{?1zeU?Y~Z^mLW?5oX$9Vq-S+D!L;b^RH5o(zMyLcFm zD6f6d=*-FLtqP@T*=LE_i?A|ZUcx`^%dB$Nt*!dUqETf5%H^gDMYA-;F>-&y^J+*X zoNm1&7^iL3jSt2s@TOo``i59cqf!m4YOE;tKu%;bJv56QncI@++Z^vviTkYL&3~Xd zZwp}AR^=Acc}I-UhN@f4Z}4}^!vvNHEpWT4kjnp%eX!@#2YWtr4HE2wEB|QQUnlSo zkRMrWq|EU%AY}|8B?l-JOhf;A7JJ9P^$i^Op>G{6(YCmc%smY#B?GWV-FKksYws&J zwKs*%PjFo$4+Gm8PyCNRY2N`lU6 zroD|QDX|`#fmM{0mGKRfRru}sWV8y@9Kd`WFAkUg#GcUb$n=8nM{T)%wYvSjqA<0= zbt%C?!-}(kxcW?sPP8HQ2xDJu>EN(<-%>T127^U13RjaT2vtjmhP+9_J;_X2$#{R< z{Z>DVTyeFJEex4}$41y&9)QmduK4-7grNn|>;8zeLyrss!S(X~&;2#vwxT00hFm=E zaV#%fV5oghWxxR;P&J+dq4-o{kMYW#j`ufFTpy_#^xNopNr3~DIL9{Aehrf$i_@XV zSM^L@73pj7-F&(nlEtRomyNugpITO*Gi|{|qwkEzW0K7HK_^#IKZ9)Lw28Qxyq)g@ z)!zZw&py&TX$-EkX_#s$Y8!$Z?Tvs17;Wg$t3pln<%=LItZ9zAkpkvW_T1$1rqSE%7Tmzb8rQNKxyll`+m1?TYG| qWRnptFd)g7W;oJWpWV-9V@soZSJ~oaIA+Sr{lKET(ci+~m;Wyi_`-$& literal 0 HcmV?d00001 From b83789da8dfcd1e586af344b5f51226b935ab5aa Mon Sep 17 00:00:00 2001 From: Cedric Dorocant Date: Fri, 6 Oct 2017 09:38:39 +0100 Subject: [PATCH 04/19] Ajout de la feature dispaly current date au script script.sh --- script.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/script.sh b/script.sh index 395d928..51cee93 100644 --- a/script.sh +++ b/script.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash # Write a script that outputs the current date -# ... \ No newline at end of file +# ... +DATE=$(date '+%Y-%m-%d') +echo -e "\nCurrent date: ${DATE}" From e06d4a2344454f0ff39665d8f32abec39ff98f50 Mon Sep 17 00:00:00 2001 From: Omar SLIMANI Date: Fri, 6 Oct 2017 09:54:45 +0100 Subject: [PATCH 05/19] feature #5 --- README.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.txt diff --git a/README.txt b/README.txt new file mode 100644 index 0000000..c7d4813 --- /dev/null +++ b/README.txt @@ -0,0 +1,3 @@ +Description du Projet + +Ce projet a pour but de comprendre GIT From 79893f99e2fe5125411be4426951f6f147c2f958 Mon Sep 17 00:00:00 2001 From: Cedric Dorocant Date: Fri, 6 Oct 2017 10:17:38 +0100 Subject: [PATCH 06/19] Ajout du fichier licence --- Licence.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 Licence.txt diff --git a/Licence.txt b/Licence.txt new file mode 100644 index 0000000..96368b7 --- /dev/null +++ b/Licence.txt @@ -0,0 +1 @@ +script de libre droits d'utilisation From 0b1f019243197d2ca10ec8a39163af6f2ba6f6b5 Mon Sep 17 00:00:00 2001 From: Philippe Sarcher Date: Fri, 6 Oct 2017 10:20:25 +0100 Subject: [PATCH 07/19] close #7 --- fusion.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 fusion.txt diff --git a/fusion.txt b/fusion.txt new file mode 100644 index 0000000..741f917 --- /dev/null +++ b/fusion.txt @@ -0,0 +1,4 @@ +Principale commaned de fusion de branches : +Se positionner dans la branche cible : "git checkout branche_cible' +Fusionnner les branches : 'git merge branche_source' + From 1efdc3a6740fbd2898fde76250a4e7ab54d1591a Mon Sep 17 00:00:00 2001 From: Remi Arbousset Date: Fri, 6 Oct 2017 10:29:51 +0100 Subject: [PATCH 08/19] close #11 --- dummy.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dummy.txt b/dummy.txt index bc5942c..59aa03a 100644 --- a/dummy.txt +++ b/dummy.txt @@ -1 +1,3 @@ -Ceci est un text qui contien des phautes \ No newline at end of file +Ceci est un text qui contien des phautes + +Ceci est du texte rajouté peut etre avec des faute, va savoire .... \ No newline at end of file From 5c6f73603c3df4625eb345a47ef8c8f5e4b22b64 Mon Sep 17 00:00:00 2001 From: totoazerty256 <32546548+totoazerty256@users.noreply.github.com> Date: Fri, 6 Oct 2017 10:50:09 +0100 Subject: [PATCH 09/19] Features 3 (#19) * -Features : close 3 * -Features : close #3 * -Features: close #3 * close 3 --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..da5db42 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +sum.js From 64f5fb271f78e18d7679fcdeb256dd61fa4f1936 Mon Sep 17 00:00:00 2001 From: Remi Arbousset Date: Fri, 6 Oct 2017 10:29:51 +0100 Subject: [PATCH 10/19] close #11 --- dummy.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dummy.txt b/dummy.txt index 9c8be01..c9582fe 100644 --- a/dummy.txt +++ b/dummy.txt @@ -1 +1,3 @@ Ceci est un text qui contient des fautes + +Ceci est du texte rajouté peut etre avec des faute, va savoire .... From 8597a4aa8557f51ca8314d8d1b305ede72e54b1a Mon Sep 17 00:00:00 2001 From: thierry Sire Date: Fri, 6 Oct 2017 10:38:19 +0100 Subject: [PATCH 11/19] Feature ajout Projet.txt --- Projet.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 Projet.txt diff --git a/Projet.txt b/Projet.txt new file mode 100644 index 0000000..41793b2 --- /dev/null +++ b/Projet.txt @@ -0,0 +1 @@ +projet de manipulation des cde GIT From 40910707b8ef94ca902031446c916e797ae50468 Mon Sep 17 00:00:00 2001 From: Christian PLAZA Date: Fri, 6 Oct 2017 10:35:44 +0100 Subject: [PATCH 12/19] features :close 8 --- feature-1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 feature-1 diff --git a/feature-1 b/feature-1 new file mode 100644 index 0000000..2953ce8 --- /dev/null +++ b/feature-1 @@ -0,0 +1 @@ +de bonnes pratiques nous facilent la vie From b012d5244852b1d4c5a5c4d043c596a6284397a4 Mon Sep 17 00:00:00 2001 From: Christian PLAZA Date: Fri, 6 Oct 2017 10:38:46 +0100 Subject: [PATCH 13/19] featur-1 en feature-8 --- feature-1 => feature-8 | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename feature-1 => feature-8 (100%) diff --git a/feature-1 b/feature-8 similarity index 100% rename from feature-1 rename to feature-8 From 126cd570b0eb28db297e96809020849623ca3088 Mon Sep 17 00:00:00 2001 From: Christian PLAZA Date: Fri, 6 Oct 2017 11:29:42 +0100 Subject: [PATCH 14/19] modification de fichier FEATURE-8 --- feature-8.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 feature-8.txt diff --git a/feature-8.txt b/feature-8.txt new file mode 100644 index 0000000..55cc52a --- /dev/null +++ b/feature-8.txt @@ -0,0 +1 @@ +une erreur dans la premier fichier feature-8 From 9a553d1f864c052618ebe330e6529f436d8f20f6 Mon Sep 17 00:00:00 2001 From: Morgan Guimard Date: Fri, 6 Oct 2017 13:51:28 +0200 Subject: [PATCH 15/19] Ajout d'un participant --- dummy.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dummy.txt b/dummy.txt index c9582fe..ed84d3e 100644 --- a/dummy.txt +++ b/dummy.txt @@ -1,3 +1,5 @@ Ceci est un text qui contient des fautes +Participants: Morgan Guimard, + Ceci est du texte rajouté peut etre avec des faute, va savoire .... From 4d77cfce65faac9c791d47ef58cd5ffc272fd673 Mon Sep 17 00:00:00 2001 From: Carine NIVELET Date: Fri, 6 Oct 2017 13:01:19 +0100 Subject: [PATCH 16/19] close#ajoutNomDummy.txt --- dummy.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dummy.txt b/dummy.txt index ed84d3e..ae024f0 100644 --- a/dummy.txt +++ b/dummy.txt @@ -1,5 +1,5 @@ Ceci est un text qui contient des fautes -Participants: Morgan Guimard, +Participants: Morgan Guimard, Carine Nivelet Ceci est du texte rajouté peut etre avec des faute, va savoire .... From a252dba41d551e2d162acd3743451b2e91b3aa2e Mon Sep 17 00:00:00 2001 From: Christian PLAZA Date: Fri, 6 Oct 2017 13:49:45 +0100 Subject: [PATCH 17/19] jout du nom prenom PLAZA Christian --- dummy.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dummy.txt b/dummy.txt index 9c8be01..71062b2 100644 --- a/dummy.txt +++ b/dummy.txt @@ -1 +1 @@ -Ceci est un text qui contient des fautes +Ceci est un text qui, Christian PLAZA est dans la place contient des fautes From 63ba964b0eca02afb9abdd51faeb33e759ee0c82 Mon Sep 17 00:00:00 2001 From: Christian PLAZA Date: Fri, 6 Oct 2017 14:03:52 +0100 Subject: [PATCH 18/19] =?UTF-8?q?effac=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dummy.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 dummy.txt diff --git a/dummy.txt b/dummy.txt deleted file mode 100644 index 71062b2..0000000 --- a/dummy.txt +++ /dev/null @@ -1 +0,0 @@ -Ceci est un text qui, Christian PLAZA est dans la place contient des fautes From c5c129ca96a958785d3c7e747dcc2637820d7acd Mon Sep 17 00:00:00 2001 From: Christian PLAZA Date: Fri, 6 Oct 2017 14:23:06 +0100 Subject: [PATCH 19/19] ajout nom PLAZA --- dummy.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dummy.txt b/dummy.txt index ae024f0..abd3ae7 100644 --- a/dummy.txt +++ b/dummy.txt @@ -1,5 +1,4 @@ Ceci est un text qui contient des fautes -Participants: Morgan Guimard, Carine Nivelet - +Participants: Morgan Guimard, Carine Nivelet, Christian PLAZA Ceci est du texte rajouté peut etre avec des faute, va savoire ....