Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
git-seminar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
Maximilian Konzack
git-seminar
Commits
41135b17
Verified
Commit
41135b17
authored
5 years ago
by
ck85nori
Browse files
Options
Downloads
Patches
Plain Diff
removes contractions
screws up syntax highlighting because of ' character
parent
cc6d1d2c
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
basics.html
+19
-18
19 additions, 18 deletions
basics.html
with
19 additions
and
18 deletions
basics.html
+
19
−
18
View file @
41135b17
...
...
@@ -192,7 +192,7 @@
notes:
- there
'
s a rule in ~~open source software~~ nay life
- there
i
s a rule in ~~open source software~~ nay life
- if you want the world to be a better place
- complain about it (issue tracker)
- if you are able to fix it: do it!
...
...
@@ -202,7 +202,7 @@
## motivation #3
### collaboration made easy
<!-- do not fix this typo, it
'
s here on purpose to show collab -->
<!-- do not fix this typo, it
i
s here on purpose to show collab -->
> This text cntains a typo.
notes:
...
...
@@ -255,8 +255,8 @@
notes:
- software, thats obvious
- blog / doc: web-pages in general are more and more managed by git
- e.g. this git cheat sheet we
'
re handing out is a git repo
- if it does
n'
t support version control, i.e. text, do
n'
t use it,
- e.g. this git cheat sheet we
a
re handing out is a git repo
- if it does
no
t support version control, i.e. text, do
no
t use it,
e.g. graphics written in dot, compiled to SVG
</section>
...
...
@@ -325,9 +325,9 @@
- **Windows:** [git bash](https://git-scm.com/download/win)
notes:
- **Windows Subsystem for Linux (WSL)**: we do
n'
t use it because
it
can
'
t use native Windows editors
- **cmder**: we
'
ve tried it, it sucks
- **Windows Subsystem for Linux (WSL)**: we do
no
t use it because
it
can
no
t use native Windows editors
- **cmder**: we
ha
ve tried it, it sucks
</section>
<section
id=
"install-your-turn"
data-markdown
>
...
...
@@ -357,9 +357,9 @@
- learn by doing / understand what you do
- GUI hides too much of that
- use GUI only if it integrates well in your workflow, e.g. IDE
- my main editor is emacs, so I
'
m using emacs integration (magit)
- my main editor is emacs, so I
a
m using emacs integration (magit)
for most of my day-to-day tasks, only a few key presses per git
operation, when I
'
m in the terminal, I simply use the CLI
operation, when I
a
m in the terminal, I simply use the CLI
</section>
<section
id=
"cli-description"
data-markdown
>
...
...
@@ -532,7 +532,7 @@
- important git command
- shows a lot of information
- shows basic git commands
- later, we
'
ll see different outputs
- later, we
wi
ll see different outputs
</section>
<section
id=
"internals-staging-area"
data-markdown
>
...
...
@@ -541,7 +541,7 @@

notes:
- **do
n'
t demo here! that
'
s done during next slide, this one is
- **do
no
t demo here! that
i
s done during next slide, this one is
about the concept of the staging area**
- **call for attention, this is important**
- in a local git repository, content can be in three stages
...
...
@@ -550,7 +550,8 @@
- **commit** this **set of changes**
- commit **should be a logical unit** of changes
- the deciding feature of a git (G)UI is how it handles the stage,
i.e. if you can't interactively stage/unstage hunks, the UI sucks
i.e. if you cannot interactively stage/unstage hunks, the UI
sucks
</section>
<section
id=
"cli-git-files"
data-markdown
>
...
...
@@ -619,7 +620,7 @@
and to the point. The body may explain in more detail why
this change was introduced.
- do
n'
t list which files changed
- do
no
t list which files changed
- the diff already tells that
References to issue trackers should be in the very end, e.g.:
...
...
@@ -772,7 +773,7 @@
note:
- show both commands in web interface when creating new repository
- explain HTTPS and SSH URLs
- for seminar, we
'
ll stick to HTTPS
- for seminar, we
wi
ll stick to HTTPS
- you can set up password manager integration later, git integrates
well with the common ones
</section>
...
...
@@ -801,9 +802,9 @@
# branch and merge
notes:
- this is a demo chapter, you
'
ll all do this in collaboration
- this is a demo chapter, you
wi
ll all do this in collaboration
chapter (next one)
- what was this **master** again? we have
n'
t explained yet
- what was this **master** again? we have
no
t explained yet
</section>
<section
id=
"branch-visual"
data-markdown
>
...
...
@@ -833,7 +834,7 @@
- comment out code
notes:
- if logical commit without breaking do
n'
t branch
- if logical commit without breaking do
no
t branch
</section>
<section
id=
"branch-commands"
data-markdown
>
...
...
@@ -1020,7 +1021,7 @@
## you can now
- create and connect to remotes
- contribute to projects you do
n'
t own
- contribute to projects you do
no
t own
- maintain projects you own
</section>
...
...
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