diff --git a/git_gitlab_course/boilerplate-single.html b/git_gitlab_course/boilerplate-single.html index 7bf528928982ad87b1828edb6c58f65a50adee5d..11f19398c3e5c982b21b9529475f4ea24d16f6b0 100644 --- a/git_gitlab_course/boilerplate-single.html +++ b/git_gitlab_course/boilerplate-single.html @@ -1,19 +1,15 @@ - My Awesome Presentation + Git & Gitlab @@ -153,93 +149,132 @@ Date: Sun Jan 12 12:20:28 2020 +0100 --- -# Agenda +# Login to gitlab -1. Introduction -2. Deep-dive -3. ... +create an account if you have none -[NOTE]: This file is portable; you don't need any other file, or an internet connection for this presentation. --- -# Introduction +# Create a gitlab project (1/2) + --- -# login to gitlab +# Create a gitlab project (2/2) -- create an account if you have none + --- -# create a gitlab project +# Finish setup gitlab + +create a password in the settings +add an SSH key (optional) + + -[images/gitlab_create_new_project.jpg] -[images/gitlab_create_new_project2.jpg] --- -# finish setup gitlab +# Finish local setup -[images/gitlab_project_created.jpg] + + -- create a password in the settings -- use an SSH key (optional) +(skip the `git init`, `git add .` and `git commit -m "Initial commit` steps) --- -# finish local setup +# Add a readme + +eplain your project for others and your future self + + + +--- + +# Add a license + +everything you write has Copyright +Copyright gives you exclusive rights (no one can use it without permission) -[images/gitlab_local_setup.jpg] +use a license to define permissions for others +MIT to allow usage without restrictions +GPL to allow usage if basic freedom granted to users +(many others) + + --- -# add Readme & License +# Install github desktop + +download from https://desktop.github.com/ +then open your repository folder -[images/gitlab_first_push.jpg] + --- -# What is a readme +# Pull changes + +download the changes made on gitlab -- Explains your project -- For your future self and others + --- -# What is a license +# Commit changes -- everything you write has Copyright -- Copyright gives you exclusive rights (so no one else may use it) -- use a license to soften up this -- use MIT to allow usage without restrictions -- use GPL to allow usage if freedom granted to users +change your local file +then preview the changes and then commit + + --- -# install github desktop +# Push changes + +push the changes -- download from https://desktop.github.com/ -- open your repository folder + --- -# commit changes +# View history -[images/github_changes.jpg] +see the changes you've made in the past + + --- -# push changes +# 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 -[images/github_push_pending.jpg] +in 30 Minutes we will start with advanced topics. --- -# view history +# Advanced topics -[images/github_history.jpg] +create branch & merge request +create issue & mention it in commit +fork & merge back into origin +add different remotes +use SSH key --- diff --git a/git_gitlab_course/images/github_add_repository.jpg b/git_gitlab_course/images/github_add_repository.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a1ad4e0be768dfc33109a1e0a69d425fefcf5bb6 --- /dev/null +++ b/git_gitlab_course/images/github_add_repository.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf0d300a08eb982e50786dcf544817054295867fcf695586e9bc7006ef4d67dc +size 117057 diff --git a/git_gitlab_course/images/github_pull_pending.jpg b/git_gitlab_course/images/github_pull_pending.jpg new file mode 100644 index 0000000000000000000000000000000000000000..9084d9871ac3b457f195f31bb6863c7746261786 --- /dev/null +++ b/git_gitlab_course/images/github_pull_pending.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31870b29984b48875efc517fdc05c89ecce167cd0485799aaf5438a223492980 +size 165255 diff --git a/git_gitlab_course/images/gitlab_add_license.jpg b/git_gitlab_course/images/gitlab_add_license.jpg new file mode 100644 index 0000000000000000000000000000000000000000..bdcbc6e91dc2002ee94be5e57a9da6f4b0ca4b0b --- /dev/null +++ b/git_gitlab_course/images/gitlab_add_license.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6adc1da2af0517a8dedf5d1cfbfb32cbcc594f81d8befd93a4424b6adca1b29d +size 159461 diff --git a/git_gitlab_course/images/gitlab_add_readme.jpg b/git_gitlab_course/images/gitlab_add_readme.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e5c90644e656a2aadf246a3bad6c74006e80d59d --- /dev/null +++ b/git_gitlab_course/images/gitlab_add_readme.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56a497fec22c85c1acdb65709cc3e49ae7b6ee0c7bb8178528cc199312359c04 +size 164328 diff --git a/git_gitlab_course/images/gitlab_local_setup_account.jpg b/git_gitlab_course/images/gitlab_local_setup_account.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e4383ee422cfc68876fff34a2a7ed8885cfb9ce5 --- /dev/null +++ b/git_gitlab_course/images/gitlab_local_setup_account.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67613b8af00afbb09a15f6ec1fdb52395557ad7267cf52e285c520519fc49eab +size 33358 diff --git a/git_gitlab_course/images/gitlab_local_setup.jpg b/git_gitlab_course/images/gitlab_local_setup_repository.jpg similarity index 100% rename from git_gitlab_course/images/gitlab_local_setup.jpg rename to git_gitlab_course/images/gitlab_local_setup_repository.jpg diff --git a/git_gitlab_course/images/xkcd_git.png b/git_gitlab_course/images/xkcd_git.png index 3f35d2d7abeed15e161dcc2b92d4851533c53aac..f598b9ba39e427b718039483af118ae605b115b7 100644 Binary files a/git_gitlab_course/images/xkcd_git.png and b/git_gitlab_course/images/xkcd_git.png differ