From 92401ee4316a37fab99e6fb543caf3521dfe7fa0 Mon Sep 17 00:00:00 2001 From: Florian Moser <products@famoser.ch> Date: Tue, 17 Mar 2020 09:31:10 +0100 Subject: [PATCH] add chapters --- git_gitlab_course/git.html | 40 +++++++++++++++----------------------- 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/git_gitlab_course/git.html b/git_gitlab_course/git.html index 1c542fe..fdec7e8 100644 --- a/git_gitlab_course/git.html +++ b/git_gitlab_course/git.html @@ -50,6 +50,12 @@ Download *git* for your operating system from [https://git-scm.com/downloads](ht --- +class: center, middle + +# Local workflow with Command Line + +--- + # Creating a local repository open your `Git-Bash` @@ -113,30 +119,10 @@ nothing added to commit but untracked files present (use "git add" to track) ``` --- -# Change something & commit it -so let's follow the advice and do -```bash -git add helloworld.html -``` - -and then **commit** this change - -```bash -git commit -m 'add my first file' -``` -you can always check everything you did with -```bash -git log -``` - -```bash -commit 3b5616d1ba962e7a2e4af1f1bdd54f5d65d4e22d (HEAD -> master) -Author: Oscan Openness <oscar@freedom.org> -Date: Sun Jan 12 12:20:28 2020 +0100 +class: center, middle - add my first file -``` +# Remote workflow with Gitlab --- @@ -180,7 +166,7 @@ add an SSH key (optional) # Add a readme -eplain your project for others and your future self +explain your project for others and your future self <img src="images/gitlab_add_readme.jpg" width="100%"> @@ -200,6 +186,12 @@ GPL to allow usage if basic freedom granted to users --- +class: center, middle + +# Github Desktop to simplify + +--- + # Install github desktop download from https://desktop.github.com/ @@ -262,7 +254,7 @@ in 30 Minutes we will start with advanced topics. # Advanced topics -best-practices for commits +best-practices for commits create branch & merge request create issue & mention it in commit use SSH key -- GitLab