3 |
3 | 
3 | 
3 | 
3 |
5 | ~~~CONFIG:name~~~
~~~CONFIG:subtitle~~~
5 | ~~~CONFIG:name~~~
~~~CONFIG:subtitle~~~
5 | ~~~CONFIG:name~~~
~~~CONFIG:subtitle~~~
5 | ~~~CONFIG:name~~~
~~~CONFIG:subtitle~~~
29 |
30 | !SLIDE smbullets printonly
31 | # Git GUI Clients: Sourcetree
32 |
33 |
34 |
35 | ~~~SECTION:handouts~~~
36 |
37 | ****
38 |
39 | Download: https://www.sourcetreeapp.com/
40 |
41 | ~~~ENDSECTION~~~
42 |
43 | !SLIDE smbullets noprint
44 | # Git GUI Clients: Gitkraken
45 |
46 | 
47 |
48 | !SLIDE smbullets printonly
49 | # Git GUI Clients: Gitkraken
50 |
51 |
52 |
53 | ~~~SECTION:handouts~~~
54 |
55 | ****
56 |
57 | Download: https://www.gitkraken.com/
58 |
59 | ~~~ENDSECTION~~~
60 |
61 | !SLIDE smbullets noprint
62 | # Git GUI Clients: GitHub Desktop
63 |
64 | 
65 |
66 | !SLIDE smbullets printonly
67 | # Git GUI Clients: GitHub Desktop
68 |
69 |
70 |
71 | ~~~SECTION:handouts~~~
72 |
73 | ****
74 |
75 | Download: https://desktop.github.com/
76 |
77 | ~~~ENDSECTION~~~
78 |
--------------------------------------------------------------------------------
/global/extras/Linux-Cheatsheet-English.md:
--------------------------------------------------------------------------------
1 | # Linux Cheatsheet (English)
2 |
3 | ## General
4 |
5 | * Absolute paths start from `/`: `cd /usr/share/local`
6 | * Relative paths start from the current directory: `cd share/local`
7 | * Manpages can be used to get help on a command: `man  |
44 |  |
45 |
57 |
58 | * Decentral VCS
59 | * Clients mirror the *version database* from a central system and work locally
60 | * Examples: Git, Mercurial
61 |
62 |
63 |
64 | !SLIDE
65 | # The History of Git
66 |
67 | Git was developed by the Linux kernel team in 2005.
68 |
69 | * They originally used BitKeeper, a closed-source commercial tool
70 | * They created Git due to some controversy with BitKeeper
71 |
72 | Their design goals:
73 |
74 | * A fully distributed VCS
75 | * Speed (when working with huge numbers of files)
76 | * Simple design
77 | * Non-linear development (branching)
78 |
79 | Git has become a de facto standard for version control.
80 |
81 | !SLIDE smbullets
82 | # The Git Workflow is local
83 |
84 | In Git we `clone` the data to our local system and work locally.
85 |
86 | * No network latency involved as with other VCS systems
87 | * Faster operations due to the local data
88 | * We can work offline and push changes later (i.e. when traveling)
89 |
--------------------------------------------------------------------------------
/day1/01_Introduction/03_Configuration.md:
--------------------------------------------------------------------------------
1 | !SLIDE smbullets
2 | # Git Configuration
3 |
4 | The Git command-line can be configured in multiple locations:
5 |
6 | * Global for the user
7 | * `$HOME/.gitconfig`
8 | * Local to the repository
9 | * `training/.git/config`
10 |
11 | Optional configuration can also be included:
12 |
13 | [includeIf "gitdir:/path/to/group/"]
14 | path = /path/to/foo.inc
15 |
16 | ~~~ENDSECTION~~~
17 |
18 | !SLIDE
19 | # Git Configuration Sections
20 |
21 | The Git configuration has different sections.
22 |
23 | * Commit author [`user`]
24 | * Core functionality (e.g. editor, pager) [`core`]
25 | * Colors [`color`] and Aliases [`alias`]
26 | * And many more...
27 |
28 | Example:
29 |
30 | @@@ Sh
31 | [user]
32 | email = name.surname@example.com
33 | name = Name Surname
34 | [core]
35 | editor = nano
36 | [color "diff"]
37 | old = red bold
38 | new = blue bold
39 |
40 | ~~~SECTION:handouts~~~
41 |
42 | ****
43 |
44 | More information can be found in the documentation at
45 | https://git-scm.com/book/tr/v2/Customizing-Git-Git-Configuration
46 |
47 | ~~~ENDSECTION~~~
48 |
49 | !SLIDE smbullets
50 | # Lab ~~~SECTION:MAJOR~~~.~~~SECTION:MINOR~~~: Configure your username and email address
51 |
52 | * Objective:
53 | * Configure your username and email address using Git CLI commands
54 | * Steps:
55 | * Use `git config --global user.name "Your Name"`
56 | * Use `git config --global user.email "name@domain.com"`
57 | * Next steps:
58 | * Verify the changes with `git config --global --list`
59 |
60 |
61 | !SLIDE supplemental exercises
62 | # Lab ~~~SECTION:MAJOR~~~.~~~SECTION:MINOR~~~: Configure your username and email address
63 |
64 | ## Objective: Configure your username and email address
65 | ****
66 |
67 | * Configure your username and email address using Git CLI commands
68 |
69 | ## Steps:
70 |
71 | ****
72 |
73 | * Use `git config --global user.name "Your Name"`
74 | * Use `git config --global user.email "name@domain.com"`
75 | * Verify the changes with `git config --global --list`
76 |
77 |
78 | !SLIDE supplemental solutions
79 | # Lab ~~~SECTION:MAJOR~~~.~~~SECTION:MINOR~~~: Proposed Solution
80 | ****
81 |
82 | ## Configure your username and email address
83 |
84 | ****
85 |
86 | ### Set the global username
87 |
88 | @@@ Sh
89 | $ git config --global user.name "Name Surname"
90 |
91 | ### Set the global email address
92 |
93 | @@@ Sh
94 | $ git config --global user.email "name.surname@example.com"
95 |
96 | ### Verification
97 |
98 | @@@ Sh
99 | $ git config --global --list
100 |
101 | In addition to that you can open the `.gitconfig` file in your $HOME directory.
102 |
103 | $ less $HOME/.gitconfig
104 |
105 | ### Notes
106 |
107 | You can also use `git config --global --list` to list all configured options.
108 |
--------------------------------------------------------------------------------
/day1/04_Commits/05_Amend.md:
--------------------------------------------------------------------------------
1 | !SLIDE smbullets
2 | # Amend changes to commits
3 |
4 | `git commit --amend` is a convenient way to modify the most recent commit.
5 |
6 | * Change the commit message (e.g. typos or better phrasing)
7 | * Fix a bug in already commited files
8 | * Add missing files into the last commit
9 |
10 | If you amend changes to a specific commit, a new unique commit ID is generated.
11 |
12 | This changes the Git history and we will learn later this might cause issues when collaborating.
13 |
14 | ~~~SECTION:handouts~~~
15 |
16 | ****
17 |
18 | Amending other commits in Git history is also possible, explained later with `git rebase`.
19 |
20 | ~~~ENDSECTION~~~
21 |
22 | !SLIDE smbullets
23 | # Lab ~~~SECTION:MAJOR~~~.~~~SECTION:MINOR~~~: Amend changes to commits
24 |
25 | * Objective:
26 | * Use git amend
27 | * Steps:
28 | * Change into `$HOME/training`
29 | * Modify README.md and add more text
30 | * Add README.md to the staging area and commit the change
31 | * Edit README.md again and add it to the staging area
32 | * Use `git commit --amend README.md` and explain what happens
33 | * Bonus:
34 | * Edit the commit message using `git commit --amend`
35 |
36 | !SLIDE supplemental exercises
37 | # Lab ~~~SECTION:MAJOR~~~.~~~SECTION:MINOR~~~: Amend changes to commits
38 |
39 | ## Objective: Use git amend
40 | ****
41 |
42 | * Use git amend
43 |
44 | ## Steps:
45 |
46 | ****
47 |
48 | * Change into `$HOME/training`
49 | * Modify README.md and add more text
50 | * Add README.md to the staging area and commit the change
51 | * Edit README.md again and add it to the staging area
52 | * Use `git commit --amend README.md` to add the change to the previous commit
53 |
54 | ## Bonus:
55 |
56 | * Adopt the commit message using `git commit --amend`
57 |
58 | !SLIDE supplemental solutions
59 | # Lab ~~~SECTION:MAJOR~~~.~~~SECTION:MINOR~~~: Proposed Solution
60 | ****
61 |
62 | ## Amend changes to commits
63 |
64 | ****
65 |
66 | ### Add the files
67 |
68 | @@@ Sh
69 | $ cd $HOME/training
70 |
71 | $ vim README.md
72 |
73 | `git commit --amend` adds missing changes to the previous commit.
74 |
75 | ### Add README.md to the staging area and commit the change
76 |
77 | @@@ Sh
78 | $ git add README.md
79 | $ git status
80 | $ git commit -v README.md -m "Add documentation for Amend"
81 |
82 | ### Add a note to README.md again
83 |
84 | @@@ Sh
85 | $ vim README.md
86 |
87 | `git commit --amend` adds missing changes to the previous commit.
88 | I'm also able to edit the commit message.
89 |
90 | $ git add README.md
91 | $ git status
92 |
93 | ### Amend README.md to the previous commit
94 |
95 | @@@ Sh
96 | $ git commit --amend -v README.md
97 | Add documentation for 'git amend'
98 |
99 | Adopt the commit message as additional exercise above.
100 |
101 | @@@ Sh
102 | $ git status
103 | $ git show
104 |
--------------------------------------------------------------------------------
/day1/03_Basics/02_Start.md:
--------------------------------------------------------------------------------
1 | !SLIDE smbullets
2 | # Start a project
3 |
4 | * `git clone`
5 | * Clones a copy of an existing remote repository (i.e. from GitLab)
6 | * Can be modified with `--depth=5`
7 | * `git init`
8 | * Initializes a local empty Git repository
9 |
10 | ~~~SECTION:handouts~~~
11 |
12 | ****
13 |
14 | `git clone` clones a copy of an existing remote Git repository
15 |
16 | `git init` initializes an empty directory as local Git repository
17 |
18 | When you clone a repository, Git automatically adds a shortcut called
19 | `origin` that points back to the "parent" repository, under the assumption
20 | that you'll want to interact with it further on down the road. This is
21 | called an `origin`.
22 |
23 | ~~~ENDSECTION~~~
24 |
25 | !SLIDE smbullets
26 | # Lab ~~~SECTION:MAJOR~~~.~~~SECTION:MINOR~~~: Clone an existing Git repository
27 |
28 | * Objective:
29 | * Clone an existing Git repository
30 | * Steps:
31 | * Navigate to https://github.com/NETWAYS/gitlab-training
32 | * Copy the clone URL
33 | * Navigate into your home directory
34 | * Use `git clone` to clone the remote Git repository
35 |
36 | !SLIDE supplemental exercises
37 | # Lab ~~~SECTION:MAJOR~~~.~~~SECTION:MINOR~~~: Clone an existing Git repository
38 |
39 | ## Objective: Clone an existing Git repository
40 | ****
41 |
42 | * Clone an existing Git repository
43 |
44 | ## Steps:
45 |
46 | ****
47 |
48 | * Navigate to https://github.com/NETWAYS/gitlab-training
49 | * Copy the clone URL
50 | * Navigate into your home directory
51 | * Use `git clone` to clone the remote Git repository
52 |
53 | !SLIDE supplemental solutions
54 | # Lab ~~~SECTION:MAJOR~~~.~~~SECTION:MINOR~~~: Proposed Solution
55 | ****
56 |
57 | ## Clone an existing Git repository
58 |
59 | ****
60 |
61 | ### Git clone
62 |
63 | @@@ Sh
64 | $ cd $HOME
65 | $ git clone https://github.com/NETWAYS/gitlab-training.git
66 |
67 | !SLIDE smbullets
68 | # Lab ~~~SECTION:MAJOR~~~.~~~SECTION:MINOR~~~: Initialize a local Git repository
69 |
70 | * Objective:
71 | * Initialize a new Git repository
72 | * Steps:
73 | * Create a new directory called `training` in your home directory
74 | * Change into it
75 | * Run `git init`
76 |
77 | We will be working inside this `training` directory unless noted otherwise.
78 |
79 | !SLIDE supplemental exercises
80 | # Lab ~~~SECTION:MAJOR~~~.~~~SECTION:MINOR~~~: Initialize a local Git repository
81 |
82 | ## Objective: Initialize Git repository
83 | ****
84 |
85 | * Initialize Git repository
86 |
87 | ## Steps:
88 |
89 | ****
90 |
91 | * Create a new directory called `training` in your home directory
92 | * Change into it
93 | * Run `git init`
94 |
95 | !SLIDE supplemental solutions
96 | # Lab ~~~SECTION:MAJOR~~~.~~~SECTION:MINOR~~~: Proposed Solution
97 | ****
98 |
99 | ## Initialize Git repository
100 |
101 | ****
102 |
103 | ### Create a new Git repository
104 |
105 | @@@ Sh
106 | $ cd $HOME
107 | $ mkdir training
108 | $ cd training
109 | $ git init
110 |
--------------------------------------------------------------------------------
/README.md:
--------------------------------------------------------------------------------
1 | # GitLab Training
2 |
3 | This [training](https://www.netways.de/trainings/gitlab/) is designed
4 | as a two days hands-on training introducing Git,
5 | GitLab, Workflows, CI/CD and many best practices with GitLab and Git.
6 |
7 | The training participants will get an in-depth insight into the Git basics,
8 | configuration and "good" commits. They also learn about GitLab basics with
9 | repository and user management and continue to practice Git version control
10 | with real-life exercises.
11 |
12 | Moving along from standalone environments, participants collaborate with
13 | others and get an overview on different Git workflows. Solving conflicts,
14 | rebasing, merging and even squasing commits also is practiced. Continuing with
15 | practices, the training dives deep into continuous integration and
16 | delivery (CI/CD) with GitLab, runners and DevOps production pipelines.
17 |
18 | On top of that, the training provides more hints on GitLab usage (project
19 | management, Web IDE, API, etc.), tools, IDEs and UIs
20 | for working with Git and anything proven useful for daily best practice.
21 |
22 | Target audience are developers and Linux administrators. Linux basics
23 | and CLI/editor knowledge is required.
24 |
25 | We have developed our training material based on years of experience in
26 | development, professional services and training. To support our work,
27 | please join the official training sessions and get your ticket at [NETWAYS](https://www.netways.de/trainings/gitlab/).
28 |
29 | * [Handouts](https://github.com/NETWAYS/gitlab-training/releases)
30 |
31 | ## Provide your training
32 |
33 | Requirements:
34 |
35 | * Docker
36 | * https://nws.netways.de GitLab instances for the trainer and participants
37 |
38 | Start the presentation with the default settings:
39 |
40 | ```
41 | ./global/wizard.sh
42 | [Enter]
43 | [Enter]
44 | ```
45 |
46 | More instructions [here](https://github.com/NETWAYS/training-global#using-docker-to-build-and-serve-the-slide-deck).
47 |
48 | ## Render mermaid.js
49 |
50 | Many diagrams are rendered using [mermaid.js](https://mermaid.js.org/). The diagrams are stored in `*.mmd` files and are rendered using the mermaid-cli.
51 |
52 | ```
53 | # Uses a containerized mermaid-cli to render all images
54 | bash render-images.sh
55 | ```
56 |
57 | To render a single image:
58 |
59 | ```
60 | docker run -u `id -u`:`id -g` --rm -v $(pwd)/_images/mermaid:/data minlag/mermaid-cli -e png -i "/data/image-to-render.mmd"
61 | ```
62 |
63 | ### Environment
64 |
65 | The training material focuses on https://nws.netways.de where every attendee
66 | gets their own GitLab instance.
67 |
68 | The [vm/](vm/) directory provides a fallback VM which can be exported
69 | from Vagrant/VirtualBox and is provisioned onto the training notebook @NETWAYS.
70 |
71 | # Contribution
72 |
73 | Patches to fix mistakes or add optional content are always appreciated. If you want to see
74 | changes on the default content of the training we are open for suggestions but keep in mind
75 | that the training is intended for a two day hands-on training.
76 |
77 | The material is licensed under [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International](https://creativecommons.org/licenses/by-nc-sa/4.0/).
78 |
--------------------------------------------------------------------------------
/day2/01_Workflows/07_Gitflow.md:
--------------------------------------------------------------------------------
1 | !SLIDE smbullets
2 | # Gitflow Workflow
3 |
4 | Gitflow is a strict branching model for larger projects
5 |
6 | * Based on Feature Branch Workflow
7 | * It assigns roles to different branches
8 | * Defines interaction between branches for releases
9 |
10 | !SLIDE smbullets noprint
11 | # Gitflow Workflow - Historical Branches
12 |
13 | The main branch is used for release history (including version tags).
14 |
15 | * The main branch is always `stable` and in production
16 | * A development branch is used for feature integration
17 |
18 | 
