diff --git a/git_gitlab_course/boilerplate-single.html b/git_gitlab_course/boilerplate-single.html index 5751c6e40683c5c25b90e35ca43ef3caff1196cf..6801e7175c9888c087974c580adb09eae7fde524 100644 --- a/git_gitlab_course/boilerplate-single.html +++ b/git_gitlab_course/boilerplate-single.html @@ -153,7 +153,7 @@ create an account if you have none # Finish setup gitlab create a password in the settings -use an SSH key (optional) +add an SSH key (optional) <img src="images/gitlab_project_created.jpg" width="100%"> @@ -171,8 +171,7 @@ use an SSH key (optional) # Add a readme -eplain your project -for other and your future self +eplain your project for others and your future self <img src="images/gitlab_add_readme.jpg" width="100%"> @@ -195,7 +194,7 @@ GPL to allow usage if basic freedom granted to users # Install github desktop download from https://desktop.github.com/ -open your repository folder +then open your repository folder <img src="images/github_add_repository.jpg" width="100%"> @@ -212,7 +211,7 @@ download the changes made on gitlab # Commit changes change your local file -preview the changes and then commit +then preview the changes and then commit <img src="images/github_changes.jpg" width="100%"> @@ -228,8 +227,38 @@ push the changes # View history +see the changes you've made in the past + <img src="images/github_history.jpg" width="100%"> +--- + +# Introduction done! + +play around with in for yourself! +we are here to answer questions. + +inspiration: +- change two files but only commit one +- revert some changes +- add some of your document to git + +ressources: +- https://education.github.com/git-cheat-sheet-education.pdf +- https://git-scm.com/book/en/v2 + +in 30 Minutes we will start with advanced topics. + +--- + +# Advanced topics + +create branch & merge request +create issue & mention it in commit +fork & merge back into origin +add different remotes +use SSH key + --- </textarea>