git initCreates a .git/ directory containing history + metadata.
For the exercise we will use git clone instead of git init.
Cloen (copy) a repository in the current folder.
git clone https://git.hackersanddesigners.nl/hrk/braids <destination>
Downloads a repo from the web, complete with the full commit history and all changes.
git statusShows:
Stage files for the next commit.
git add index.html git add assets/
Stage everything (use carefully):
git add .
Staging is curatorial: select what belongs together.
git commit -m "Added name to my page"
Good commit message pattern:
git log --oneline --graph
Gives a quick "finding aid" of earlier commits. Press 'q' to exit.
List branches:
git branchCreate a branch:
git branch people/yourname
Switch to branch:
git checkout people/yourname
Shortcut (create + switch):
git checkout -b people/yourname
Branches are parallel dossiers: safe space for changes.
Push your branch to the server:
git push -u origin people/yourname
Pull updates from server:
git pullDuring the exercise you mostly push your branch. Pull is mainly for getting new changes on main (if needed).
Remove a tracked file and stage the removal:
git rm old.html -git commit -m "Remove old page"
For this workshop you probably will not need it.
For this workshop you probably will not need it.
Share your username with us so we can add you as a collaborator
Rules for today:
We will provide:
You will build a (deliberately) simple page:
Workflow loop:
clone -> branch -> edit -> status -> add -> commit -> push -> view -> iterate
cd to a logical location in your computer, then:
git clone https://git.hackersanddesigners.nl/hrk/braids diff --git a/slides.rst b/slides.rst index 69b6e50..5b3fa17 100644 --- a/slides.rst +++ b/slides.rst @@ -331,6 +331,7 @@ For this workshop you probably will not need it. Forgejo: what we use today ========================== +- Forgejo is an open-source alternative to Github - Forgejo hosts the central repository (remote) - You will: - create an account