diff --git a/basics.html b/basics.html index 7ae8a1f0b5a3a9f5e09c3cd3c1c0e0c35dd7063c..d6b742700e59c4eb4e482b49fd6b672061d5f4d2 100644 --- a/basics.html +++ b/basics.html @@ -710,19 +710,9 @@ notes: - collaboration needs remote repositories - - by-product of remotes is backup: my `~/projects` does not need to - be backed up because **every** project is under version control - and has a remote - </section> - - <section id="distributed-remotes" data-markdown> - ## remotes - -  - - notes: - - remotes have names, default to origin - - remotes are clones + - by-product of remotes is backup + - ideally, `~/projects` needs no backup because **every** project + is under version control and has a remote </section> <section id="distributed-webapps" data-markdown> @@ -737,6 +727,39 @@ - create project - push / pull </section> + + <section id="distributed-remotes" data-markdown> + ## connecting remotes + + ```bash + # get fresh clone + git clone url + + # add remote to existing repository + git remote add name url + ``` + + note: + - show both commands in web interface when creating new repository + - explain HTTPS and SSH URLs + - for seminar, we'll stick to HTTPS + - you can set up password manager integration later, git integrates + well with the common ones + </section> + + <section id="distributed-remote-interaction" data-markdown> + ## remote + ### interaction + +  + + 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** + - **push** and **pull** also **merge** the *tracking* branch + </section> </section> <!---------------------------------------------------------------------