Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
lecture materials
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Marius Rixen
lecture materials
Commits
564d3215
Verified
Commit
564d3215
authored
1 year ago
by
Lukas Kluft
Browse files
Options
Downloads
Patches
Plain Diff
Add speaker notes as reminder for important messages
Co-authored-by:
Tobias Koelling
<
tobias.koelling@mpimet.mpg.de
>
parent
c454e686
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lectures/git/slides.qmd
+11
-0
11 additions, 0 deletions
lectures/git/slides.qmd
with
11 additions
and
0 deletions
lectures/git/slides.qmd
+
11
−
0
View file @
564d3215
...
...
@@ -98,6 +98,9 @@ On Levante: `module load git`
* Allow incremental development without impacting the other branches
:::
::: {.notes}
Make sure to introduce feature and bugfix
:::
## Create a branch {.leftalign}
...
...
@@ -125,6 +128,11 @@ git diff develop..main
```
:::
::: {.notes}
* Git branches are just pointers to a hash!
* Sometimes it is nice to visualize a branch as a sequence of commits (e.g. "feature branch"), but technically it is just a label for a commit
:::
## Merge a branch
Merge the commits of `develop` into `main`
...
...
@@ -323,6 +331,9 @@ Example from [kernel.org](https://git.kernel.org/pub/scm/linux/kernel/git/torval

::: {.notes}
GitLab can act as a remote (like Github or even a local copy could also).
:::
## Hands-on session {background-color=var(--dark-bg-color) .leftalign}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment