From 88acf9b516caf360775dd0da2894652894f7bc60 Mon Sep 17 00:00:00 2001 From: Heerko Date: Fri, 9 Jan 2026 17:20:21 +0100 Subject: [PATCH] forgeji --- html_output/index.html | 2 +- slides.rst | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/html_output/index.html b/html_output/index.html index 1471731..04a2c0d 100644 --- a/html_output/index.html +++ b/html_output/index.html @@ -15,7 +15,7 @@ then do a little branch-based website exercise published live.

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:

  • current branch
  • staged vs unstaged changes
  • untracked files

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:

  • What changed
  • Why it changed (reason/intent)
  • Scope stays small

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

  • Forgejo hosts the central repository (remote)
  • You will: +git commit -m "Remove old page"

    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 - 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
  • create your branch under people/<slug>

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:

  • "Hi, I'm …"
  • maybe a gif?
  • a link?
  • optional: background, glitter, bad taste encouraged

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