diff --git a/basics.html b/basics.html index 49c1dbb1794e43b4511f61ca88c12f0ff41af0ee..76918b80eb1fbc0ce9505938657ed5a2a161850e 100644 --- a/basics.html +++ b/basics.html @@ -54,6 +54,9 @@ 1. intro and installation 1. setup and local repositories 1. remote repositories and collaboration + + note: + - we have dynamic breaks, try at most 90 minutes without break </section> <section id="intro-version-control" data-markdown> @@ -326,16 +329,12 @@ </section> </section> - <section id="break-1" data-markdown> - # break - - notes: - - keep break short, only for installation - </section> - <section> <section id="setup" data-markdown> # setup + + notes: + - add **break** here if needed </section> <section id="setup-cli" data-markdown> @@ -417,6 +416,9 @@ git config --global alias.unstage 'reset HEAD --' git config --global alias.lol \ 'log --graph --decorate --oneline --all' + + # show config + git config --list ``` notes: @@ -451,6 +453,9 @@ <section id="cli-basic" data-markdown> # git command line ## local repositories + + notes: + - add **break** here if needed </section> <section id="cli-create-repository" data-markdown> @@ -635,6 +640,7 @@ ## aka legal shit notes: + - add **break** here if needed - unfortunately, we have to talk about this - go back to initial commit - initial commit should contain not just readme but license, too @@ -670,10 +676,6 @@ </section> </section> - <section id="break-2" data-markdown> - # break - </section> - <!--------------------------------------------------------------------- <!-- distributed <!--------------------------------------------------------------------> @@ -682,6 +684,9 @@ <section id="distributed" data-markdown> # distributed ## version control system + + notes: + - add **break** here if needed </section> <section id="distributed-local" data-markdown> @@ -809,6 +814,7 @@ # collaboration notes: + - add **break** here if needed - we: create new repo - group: fork and clone, remote add upstream, lol - next slide, explain img