Ajout des fichiers de vérification et des scripts de sauvetage

Ajout des fichiers de vérification et des scripts de sauvetage

Add LICENSE

Correction alias log

shheeebbaaaannngg
This commit is contained in:
2018-10-23 22:56:26 +02:00
committed by Thibaud Duhautbout
parent 064ed1ad87
commit 243c15c4aa
12 changed files with 84 additions and 1 deletions

14
reset_hard.sh Executable file
View File

@@ -0,0 +1,14 @@
git remote add origin https://gitlab.utc.fr/picasoft/formations/A18/tp-v2
git fetch
git checkout master
git reset --hard origin/master
git checkout rebase_simple
git reset --hard origin/rebase_simple
git checkout rebase_conflit
git reset --hard origin/rebase_conflit
git checkout merge_conflit
git reset --hard origin/merge_conflit
git checkout merge_simple
git reset --hard origin/merge_simple
git remote remove origin
git checkout master