diff --git a/basics.html b/basics.html index f1780432997c39669a686ad2253a3d35d0879871..a05e21ff07af48d407d27327d7a3968a994a9da7 100644 --- a/basics.html +++ b/basics.html @@ -103,6 +103,11 @@ > records changes what, who, when, why + + note: + - different kinds of version control systems + - for different meta-level things + - git is for text files / source code </section> <section id="intro-about-git" data-markdown> @@ -125,7 +130,7 @@ <section id="intro-about-christian" data-markdown> ## about christian - - scientific computing support @ iDiv since 2014 + - [scientific computing support @ iDiv](https://www.idiv.de/en/about-idiv/support-for-scientists/scientific-computing.html) since 2014 - happy git user since 2010 > There will never be a better version control system than git. @@ -153,7 +158,7 @@ <section id="motivation" data-markdown> # motivation - > Why should I use version control? + > Why should ***I*** use version control? notes: - summarize reasons from audience @@ -208,11 +213,8 @@ > This text cntains a typo. notes: - - demo GitLab - - [go to project](https://git.idiv.de/sc/edu/git-seminar) - - check if typo still in master - - edit - - change **target branch** to create merge request + - demo **edit** ribbon + - change target branch (creates MR) to: **basics/typo** - commit message: ``` fixes typo @@ -242,7 +244,7 @@ - enforce **style guide** aka *code formatting* - ***deployment*** (app store, web server) - *(see advanced seminar)* + *(see advanced)* notes: - buzzwords: @@ -577,9 +579,9 @@ notes: - users should do this in a terminal with demo by us - - git stage git add are the same thing - - prefer stage and unstage because the opposite of add is remove - and that does something entirely different + - `git stage` and `git add` are the same thing + - prefer `stage` and `unstage` because the opposite of `add` is + `rm` and that does something entirely different </section> <section id="cli-git-diff-1" data-markdown> @@ -801,10 +803,11 @@  notes: - - remotes have names, default to origin - - remotes are **full clones**, i.e. entire history - - **fetch** is on the box, so you **fetch everything** - - **fetch** does not integrate branches, i.e. **merge** + - remotes have names, default to **origin** + - remotes are usually **full clones**, i.e. entire history, all + commits, all branches + - **fetch** edge is on the box, so you fetch **everything** + - **fetch** does not integrate branches, i.e. no **merge** - **push** and **pull** also **merge** the *tracking* branch </section> </section>