diff --git a/html_output/2026-01-08_hrko.html b/html_output/2026-01-08_hrko.html new file mode 100644 index 0000000..72150e7 --- /dev/null +++ b/html_output/2026-01-08_hrko.html @@ -0,0 +1,29 @@ +Braids - Intro to Git

Soilpunk 🌏🤘 - Joulethief

Git as Archiving: MySpace-Style Pages (90 min)

Goal: introduce Git as an archiving practice (history, provenance, selection), +then do a playful branch-based website exercise published live.

Agenda (90 min)

  1. Context: what Git is, what it does, who uses it (10 min)
  2. Install + quick sanity check (10 min)
  3. Core concepts + core commands (20 min)
  4. Forgejo: accounts + clone/push permissions (10 min)
  5. Exercise: branch a page, publish live, iterate (35 min)
  6. Wrap-up: good practices + next steps (5 min)

What is Git

Archiving analogy:

What Git is not

Ecosystem

Typical workflow terms:

Workshop outcome

Each participant will:

Install Git

Check first:

git --version

If missing:

Minimum requirement: you can run git in a terminal.

Configure identity (once)

git config --global user.name  "Your Name"
+git config --global user.email "you@example.com"

Check:

git config --global --list

This shows up in commit metadata (provenance).

Core concept: three areas

  1. Working tree: your files right now
  2. Staging area (index): selection for the next deposit
  3. Repository history: commits (deposits)

This is why Git feels "archival":

Commands: the essential set

You listed most, but for usability we add 3:

Recommended minimal set for today:

Command: git init

Create a repository in the current folder.

git init

Creates a .git/ directory containing history + metadata.

For the exercise we will use git clone instead of git init.

Command: git status (your dashboard)

git status

Shows:

If you only remember one command: remember this.

Command: git add (selection)

Stage files for the next commit (deposit).

git add index.html
+git add assets/

Stage everything (use carefully):

git add .

Staging is curatorial: select what belongs together.

Command: git commit (deposit + metadata)

git commit -m "Add MySpace-style profile page"

Good commit message pattern:

Command: git diff (what changed)

Unstaged changes:

git diff

Staged changes:

git diff --staged

Command: git log (inventory)

git log --oneline --decorate --graph -n 10

Gives a quick "finding aid" of deposits.

Command: git branch and git checkout

List branches:

git branch

Create 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.

Command: git push / git pull

Push your branch to the server:

git push -u origin people/yourname

Pull updates from server:

git pull

During the exercise you mostly push your branch. +Pull is mainly for getting new changes on main (if needed).

Optional: git rm

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.

Forgejo: what we use today

Rules for today:

Forgejo: account setup

  1. Create account at: git.<your-domain>
  2. Confirm you can sign in
  3. Add SSH key (optional) OR use HTTPS credentials

We will provide:

Exercise overview

You will build a deliberately simple “MySpace-style” page:

Workflow loop:

clone -> branch -> edit -> status -> add -> commit -> push -> view -> iterate

Exercise: step 1 (clone)

git clone <REPO_URL>
+cd <REPO_NAME>

Sanity check:

git status
+git branch

Exercise: step 2 (create your branch)

Choose a slug: lowercase, no spaces. Example: people/alex.

git checkout -b people/<your-slug>

Confirm:

git status

Exercise: step 3 (edit the page)

Edit the root index.html (and optionally style.css, assets/).

Make a visible change first:

Then check changes:

git diff
+git status

Exercise: step 4 (stage + commit)

git add index.html
+git commit -m "Customize profile page for <your-slug>"

If you added assets:

git add assets/
+git commit -m "Add assets for <your-slug>"

Small commits win. One change = one deposit.

Exercise: step 5 (push your branch)

git push -u origin people/<your-slug>

If prompted for credentials, use your Forgejo login method.

Exercise: step 6 (view live)

Open the gallery:

Find your card:

Iterate:

edit -> status -> add -> commit -> push -> refresh

Common problems (fast fixes)

Wrong branch:

git branch
+git checkout people/<your-slug>

Nothing staged:

git status
+git add index.html

Push rejected (main protected):

Auth issues:

Concept recap in archiving terms

Suggested “good enough” commit messages

Bad:

Better:

Rule: message should still make sense in 6 months.

Optional extension (if time remains)

Wrap-up

You should now be able to:

Next steps:

End: remind participants their branches will be removed after the workshop.

\ No newline at end of file diff --git a/html_output/2026-01-09_hrko.html b/html_output/2026-01-09_hrko.html new file mode 100644 index 0000000..622eab9 --- /dev/null +++ b/html_output/2026-01-09_hrko.html @@ -0,0 +1,30 @@ +Braids - Intro to Git

Braids - Intro to Git

Braids - Intro to Git

Goal: introduce Git as an archiving practice, +then do a little branch-based website exercise published live.

Agenda (90 min)

  1. Context: what Git is, what it does, who uses it (10 min)
  2. Install Git (10 min)
  3. Core concepts + core commands (20 min)
  4. Forgejo: accounts + clone/push permissions (10 min)
  5. Exercise: branch a page, publish live, iterate (35 min)
  6. Wrap-up: good practices + next steps (5 min)

What is Git

Archiving analogy:

What Git is not

Ecosystem

Typical workflow

Workshop outcome

Each participant will:

Install Git

Check first:

git --version

If missing:

Minimum requirement: you can run git in a terminal.

Configure identity (once)

git config --global user.name  "Your Name"
+git config --global user.email "you@example.com"

Check:

git config --global --list

This shows up in commit metadata (provenance).

Core concept: three areas

  1. Working tree: your files right now
  2. Staging area (index): selection for the next deposit
  3. Repository history: commits (deposits)

This is why Git feels "archival":

Commands: the essential set

Command: git init

Create a repository in the current folder. +Use this when you are creating and working on your own projects.

git init

Creates a .git/ directory containing history + metadata.

For the exercise we will use git clone instead of git init.

Command: git clone

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.

Command: git status (your dashboard)

git status

Shows:

Command: git add (select files)

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.

Command: git commit

git commit -m "Added name to my page"

Good commit message pattern:

Command: git log (inventory)

git log --oneline --graph

Gives a quick "finding aid" of earlier commits. Press 'q' to exit.

Command: git branch and git checkout

List branches:

git branch

Create 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.

Command: git push / git pull

Push your branch to the server:

git push -u origin people/yourname

Pull updates from server:

git pull

During the exercise you mostly push your branch. +Pull is mainly for getting new changes on main (if needed).

Optional: git rm

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.

Forgejo: what we use today

Share your username with us so we can add you as a collaborator

Rules for today:

Forgejo: account setup

  1. Create account at: git.hackersanddesigners.nl
  2. Confirm you can sign in

We will provide:

Exercise overview

You will build a (deliberately) simple page:

Workflow loop:

clone -> branch -> edit -> status -> add -> commit -> push -> view -> iterate

Exercise: step 1 (clone)

cd to a logical location in your computer, then:

git clone https://git.hackersanddesigners.nl/hrk/braids
+cd braids

If everything went well, check the repo with:

git status
+git branch

Exercise: step 2 (create your branch)

Choose a slug: lowercase, no spaces. This can be your name or an alias. Example: change people/<your-slug> in the command below to people/alex.

git checkout -b people/<your-slug>

Confirm:

git status

Exercise: step 3 (edit the page)

Edit the root index.html (and optionally style.css, assets/).

Make a visible change first:

Then check changes:

git diff
+git status

Exercise: step 4 (stage + commit)

git add index.html
+git commit -m "Customize profile page for <your-slug>"

If you added assets:

git add assets/
+git commit -m "Add assets for <your-slug>"

Small commits win. One change = one deposit.

Exercise: step 5 (push your branch)

git push -u origin people/<your-slug>

(Again, change <your-slug>!)

If prompted for credentials, use your Forgejo login method.

Exercise: step 6 (view live)

Open the gallery:

Find your card:

Iterate:

edit -> status -> add -> commit -> push -> refresh

Common problems (fast fixes)

Wrong branch:

git branch
+git checkout people/<your-slug>

Nothing staged:

git status
+git add index.html

Push rejected (main protected):

Auth issues:

Concept recap in archiving terms

Suggested “good enough” commit messages

Bad:

Better:

Rule: message should still make sense in 6 months.

Optional extension (if time remains)

Wrap-up

You should now be able to:

Learn more:

End: remind participants their branches will be removed after the workshop.

\ No newline at end of file diff --git a/html_output/index.html b/html_output/index.html index 8e40ce0..622eab9 100644 --- a/html_output/index.html +++ b/html_output/index.html @@ -4,26 +4,27 @@ messageStyle: "none", TeX : { extensions : ['color.js'] } }); -

Braids - Intro to Git

Braids - Intro to Git

Goal: introduce Git as an archiving practice (history, provenance, selection), -then do a playful branch-based website exercise published live.

Agenda (90 min)

  1. Context: what Git is, what it does, who uses it (10 min)
  2. Install + quick sanity check (10 min)
  3. Core concepts + core commands (20 min)
  4. Forgejo: accounts + clone/push permissions (10 min)
  5. Exercise: branch a page, publish live, iterate (35 min)
  6. Wrap-up: good practices + next steps (5 min)

What is Git

Share your username with us so we can add you as a collaborator

Rules for today:

Forgejo: account setup

  1. Create account at: git.hackersanddesigners.nl
  2. Confirm you can sign in

We will provide:

Exercise overview

You will build a (deliberately) simple page:

Workflow loop:

clone -> branch -> edit -> status -> add -> commit -> push -> view -> iterate

Exercise: step 1 (clone)

cd to a logical location in your computer, then:

git clone https://git.hackersanddesigners.nl/hrk/braids
+cd braids

If everything went well, check the repo with:

git status
+git branch

Exercise: step 2 (create your branch)

Choose a slug: lowercase, no spaces. This can be your name or an alias. Example: change people/<your-slug> in the command below to people/alex.

git checkout -b people/<your-slug>

Confirm:

git status

Exercise: step 3 (edit the page)

Edit the root index.html (and optionally style.css, assets/).

Make a visible change first:

Then check changes:

git diff
+git status

Exercise: step 4 (stage + commit)

git add index.html
 git commit -m "Customize profile page for <your-slug>"

If you added assets:

git add assets/
-git commit -m "Add assets for <your-slug>"

Small commits win. One change = one deposit.

Exercise: step 5 (push your branch)

git push -u origin people/<your-slug>

If prompted for credentials, use your Forgejo login method.

Exercise: step 6 (view live)

Open the gallery:

Find your card:

Iterate:

edit -> status -> add -> commit -> push -> refresh

Common problems (fast fixes)

Wrong branch:

git branch
+git commit -m "Add assets for <your-slug>"

Small commits win. One change = one deposit.

Exercise: step 5 (push your branch)

git push -u origin people/<your-slug>

(Again, change <your-slug>!)

If prompted for credentials, use your Forgejo login method.

Exercise: step 6 (view live)

Open the gallery:

Find your card:

Iterate:

edit -> status -> add -> commit -> push -> refresh

Common problems (fast fixes)

Wrong branch:

git branch
 git checkout people/<your-slug>

Nothing staged:

git status
-git add index.html

Push rejected (main protected):

Auth issues:

Concept recap in archiving terms

Suggested “good enough” commit messages

Bad:

Better:

Rule: message should still make sense in 6 months.

Optional extension (if time remains)

Wrap-up

You should now be able to:

Next steps:

End: remind participants their branches will be removed after the workshop.

\ No newline at end of file +git add index.html

Push rejected (main protected):

Auth issues:

Concept recap in archiving terms

Suggested “good enough” commit messages

Bad:

Better:

Rule: message should still make sense in 6 months.

Optional extension (if time remains)

Wrap-up

You should now be able to:

Learn more:

End: remind participants their branches will be removed after the workshop.

\ No newline at end of file diff --git a/slides.rst b/slides.rst index 6a39f48..0c7bc8c 100644 --- a/slides.rst +++ b/slides.rst @@ -170,6 +170,7 @@ Command: git init ================= Create a repository in the current folder. +Use this when you are creating and working on your own projects. .. code-block:: bash @@ -191,7 +192,7 @@ Cloen (copy) a repository in the current folder. .. code-block:: bash - git clone + git clone https://git.hackersanddesigners.nl/hrk/braids Downloads a repo from the web, complete with the full commit history and all changes. @@ -247,24 +248,25 @@ Good commit message pattern: - Why it changed (reason/intent) - Scope stays small ----- +.. + ---- -Command: git diff (what changed) -================================ + Command: git diff (what changed) + ================================ -Unstaged changes: + Unstaged changes: -.. code-block:: bash + .. code-block:: bash - git diff + git diff -Staged changes: + Staged changes: -.. code-block:: bash + .. code-block:: bash - git diff --staged + git diff --staged ----- + ---- Command: git log (inventory) ============================ @@ -352,9 +354,11 @@ Forgejo: what we use today - Forgejo hosts the central repository (remote) - You will: - create an account - - clone via HTTPS/SSH + - clone via HTTPS - push your branch +Share your username with us so we can add you as a collaborator + Rules for today: - do NOT push to `main` @@ -367,11 +371,10 @@ Forgejo: account setup 1. Create account at: `git.hackersanddesigners.nl` 2. Confirm you can sign in -3. Add SSH key (optional) OR use HTTPS credentials We will provide: -- repo URL +- https://git.hackersanddesigners.nl/hrk/braids - branch naming convention - live gallery URL: `braids.hackersanddesigners.nl` @@ -380,11 +383,11 @@ We will provide: Exercise overview ================= -You will build a deliberately simple “MySpace-style” page: +You will build a (deliberately) simple page: - "Hi, I'm …" -- one gif -- one link +- maybe a gif? +- a link? - optional: background, glitter, bad taste encouraged Workflow loop: @@ -396,12 +399,14 @@ clone -> branch -> edit -> status -> add -> commit -> push -> view -> iterate Exercise: step 1 (clone) ======================== +`cd` to a logical location in your computer, then: + .. code-block:: bash - git clone - cd + git clone https://git.hackersanddesigners.nl/hrk/braids + cd braids -Sanity check: +If everything went well, check the repo with: .. code-block:: bash @@ -413,7 +418,7 @@ Sanity check: Exercise: step 2 (create your branch) ===================================== -Choose a slug: lowercase, no spaces. Example: `people/alex`. +Choose a slug: lowercase, no spaces. This can be your name or an alias. Example: change `people/` in the command below to `people/alex`. .. code-block:: bash @@ -434,9 +439,7 @@ Edit the root `index.html` (and optionally `style.css`, `assets/`). Make a visible change first: -- your name -- one gif -- one link +- Change the name to your name (or your alias) Then check changes: @@ -475,6 +478,8 @@ Exercise: step 5 (push your branch) git push -u origin people/ +(Again, change !) + If prompted for credentials, use your Forgejo login method. ----