clean up text
This commit is contained in:
parent
ff487ad311
commit
8e00d7a739
19
slides.rst
19
slides.rst
|
|
@ -14,8 +14,8 @@ Braids - Intro to Git
|
||||||
|
|
||||||
.. note::
|
.. note::
|
||||||
|
|
||||||
Goal: introduce Git as an archiving practice (history, provenance, selection),
|
Goal: introduce Git as an archiving practice,
|
||||||
then do a playful branch-based website exercise published live.
|
then do a little branch-based website exercise published live.
|
||||||
|
|
||||||
----
|
----
|
||||||
|
|
||||||
|
|
@ -23,7 +23,7 @@ Agenda (90 min)
|
||||||
===============
|
===============
|
||||||
|
|
||||||
1. Context: what Git is, what it does, who uses it (10 min)
|
1. Context: what Git is, what it does, who uses it (10 min)
|
||||||
2. Install + quick sanity check (10 min)
|
2. Install Git (10 min)
|
||||||
3. Core concepts + core commands (20 min)
|
3. Core concepts + core commands (20 min)
|
||||||
4. Forgejo: accounts + clone/push permissions (10 min)
|
4. Forgejo: accounts + clone/push permissions (10 min)
|
||||||
5. Exercise: branch a page, publish live, iterate (35 min)
|
5. Exercise: branch a page, publish live, iterate (35 min)
|
||||||
|
|
@ -519,8 +519,7 @@ Push rejected (main protected):
|
||||||
|
|
||||||
Auth issues:
|
Auth issues:
|
||||||
|
|
||||||
- HTTPS: check username/token/password
|
- HTTPS: check username/password
|
||||||
- SSH: check key added to Forgejo + `ssh -T`
|
|
||||||
|
|
||||||
----
|
----
|
||||||
|
|
||||||
|
|
@ -531,7 +530,7 @@ Concept recap in archiving terms
|
||||||
- log = inventory / chain of custody
|
- log = inventory / chain of custody
|
||||||
- diff = conservation report (what changed)
|
- diff = conservation report (what changed)
|
||||||
- branch = parallel dossier
|
- branch = parallel dossier
|
||||||
- push = deposit to institutional archive (remote)
|
- push = share publicly / deposit to institutional archive (remote)
|
||||||
|
|
||||||
----
|
----
|
||||||
|
|
||||||
|
|
@ -549,7 +548,6 @@ Better:
|
||||||
- "Add animated gif and profile link"
|
- "Add animated gif and profile link"
|
||||||
- "Change background and typography"
|
- "Change background and typography"
|
||||||
- "Fix broken image path"
|
- "Fix broken image path"
|
||||||
- "Refactor layout: move link block above gif"
|
|
||||||
|
|
||||||
Rule: message should still make sense in 6 months.
|
Rule: message should still make sense in 6 months.
|
||||||
|
|
||||||
|
|
@ -575,11 +573,10 @@ You should now be able to:
|
||||||
- publish to a remote
|
- publish to a remote
|
||||||
- read history and differences
|
- read history and differences
|
||||||
|
|
||||||
Next steps:
|
Learn more:
|
||||||
|
|
||||||
- merging via PRs (review workflow)
|
- `Learn Git Branching <https://learngitbranching.js.org/>`_
|
||||||
- tags/releases (archival milestones)
|
- `Oh My Git <https://ohmygit.org/>`_
|
||||||
- basic collaboration patterns (feature branches)
|
|
||||||
|
|
||||||
.. note::
|
.. note::
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue