Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
d3ae502
fix #4
soussou Oct 6, 2017
a051795
Features : close 6
Oct 6, 2017
28ac8c4
close#10 ajout fichier Photo.jpg
Carine2126 Oct 6, 2017
b83789d
Ajout de la feature dispaly current date au script script.sh
Oct 6, 2017
e06d4a2
feature #5
Oct 6, 2017
79893f9
Ajout du fichier licence
Oct 6, 2017
0b1f019
close #7
Oct 6, 2017
038d9e6
Merge pull request #12 from safa-git/bug-#4
RonanGIT Oct 6, 2017
1efdc3a
close #11
kickingRaccoon Oct 6, 2017
c5adaea
Merge pull request #20 from fifikarsher/feature-#7
tsigit25 Oct 6, 2017
e23b4b1
Merge pull request #22 from formationgit102017/Features-6
tsigit25 Oct 6, 2017
5f87872
Merge pull request #14 from formationgit2017/Bugfix-#10
tsigit25 Oct 6, 2017
5c6f736
Features 3 (#19)
totoazerty256 Oct 6, 2017
4091070
features :close 8
Oct 6, 2017
b012d52
featur-1 en feature-8
Oct 6, 2017
126cd57
modification de fichier FEATURE-8
Oct 6, 2017
64f5fb2
close #11
kickingRaccoon Oct 6, 2017
9f42343
Resolution conflit merge dummy.txt
kickingRaccoon Oct 6, 2017
8597a4a
Feature ajout Projet.txt
Oct 6, 2017
ba9270f
Merge pull request #15 from rems75012/features-#11
RonanGIT Oct 6, 2017
9a553d1
Ajout d'un participant
mguimard Oct 6, 2017
4ea1abf
fix-99 : Ajout de mon prenom
Oct 6, 2017
d3c8d1c
Merge pull request #23 from omarSlimani/Features-#5
RonanGIT Oct 6, 2017
09e608c
Merge pull request #21 from totoced/Features
RonanGIT Oct 6, 2017
4d77cfc
close#ajoutNomDummy.txt
Carine2126 Oct 6, 2017
74bdbff
Merge pull request #25 from formationgit2017/features#ajoutNom
RonanGIT Oct 6, 2017
a252dba
jout du nom prenom PLAZA Christian
Oct 6, 2017
63ba964
effacé
Oct 6, 2017
13ba5b4
Merge pull request #32 from formationgit102017/Fixebug-99
tsigit25 Oct 6, 2017
5a8d0cc
ajouts nouveaux fichiers
Oct 6, 2017
bafdd19
Ajout de mon nom et prenom
Oct 6, 2017
a8f4a37
philippe sarcher
Oct 6, 2017
02a9c21
re-re-re-re-re-remerge
kickingRaccoon Oct 6, 2017
1a15287
Merge pull request #26 from rems75012/ajout-nom-remi
tsigit25 Oct 6, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sum.js
27 changes: 27 additions & 0 deletions InitDepot.txt
Original file line number Diff line number Diff line change
@@ -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 <NOM_DU_DEPOT>
# ex : git init dep_toto

# Cloner un dépôt existant
git clone <LIEN_DU_DEPOT>
# ex : git clone git@github.com:formationgit102017/git-training-2.git

# Afficher les branches
git branch -a

# Changer de branche
git checkout <NOM_DE_BRANCHE>

# Créer une branche
git branch <NOM_DE_BRANCHE>

# 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
1 change: 1 addition & 0 deletions Licence.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
script de libre droits d'utilisation
Binary file added Photo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions Projet.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
projet de manipulation des cde GIT
3 changes: 3 additions & 0 deletions README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Description du Projet

Ce projet a pour but de comprendre GIT
6 changes: 5 additions & 1 deletion dummy.txt
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
Ceci est un text qui contien des phautes
Ceci est un text qui contient des fautes

Participants: Morgan Guimard, Carine Nivelet, Cedric Dorocant, Remi Arbousset, Adrien Duyck, P. Sarcher

Ceci est du texte rajout� peut etre avec des faute, va savoire ....
1 change: 1 addition & 0 deletions feature-8
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
de bonnes pratiques nous facilent la vie
1 change: 1 addition & 0 deletions feature-8.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
une erreur dans la premier fichier feature-8
4 changes: 4 additions & 0 deletions fusion.txt
Original file line number Diff line number Diff line change
@@ -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'

4 changes: 3 additions & 1 deletion script.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/usr/bin/env bash

# Write a script that outputs the current date
# ...
# ...
DATE=$(date '+%Y-%m-%d')
echo -e "\nCurrent date: ${DATE}"