thibaud/tp-git-expleo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

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

Add LICENSE

Correction alias log

shheeebbaaaannngg
This commit is contained in:
Thibaud Duhautbout
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
Download Patch File Download Diff File Expand all files Collapse all files

7
reset_rebase_conflits.sh Executable file
View File

@@ -0,0 +1,7 @@
git remote add origin https://gitlab.utc.fr/picasoft/formations/A18/tp-v2
git fetch
git checkout --quiet master
git reset --hard HEAD^
git checkout --quiet rebase_conflit
git reset --hard origin/rebase_conflit
git remote remove origin