diff --git a/build.sh b/build.sh index 80fe371..b963aca 100755 --- a/build.sh +++ b/build.sh @@ -2,11 +2,21 @@ FILE="$(realpath "${BASH_SOURCE[0]}")" ROOT="$(dirname "${FILE}")" +INPUT="${ROOT}/in" +INPUTS="${ROOT}/in.txt" OUTPUT="${ROOT}/out" +function main { +local file +local files=() + rm --force --recursive "${OUTPUT}" mkdir --parents "${OUTPUT}" +for file in $(cat "${INPUTS}") ; do + files+=("${INPUT}/${file}.md") +done + pandoc \ --verbose \ --standalone \ @@ -20,4 +30,9 @@ pandoc \ --write 'revealjs' \ --variable revealjs-url='/sw/revealjs/up' \ --variable slideNumber \ -"${ROOT}/index.md" +\ +"${files[@]}" + +} + +main diff --git a/in.txt b/in.txt new file mode 100644 index 0000000..981bdd3 --- /dev/null +++ b/in.txt @@ -0,0 +1,3 @@ +info +plan +index diff --git a/index.md b/in/index.md similarity index 68% rename from index.md rename to in/index.md index 07fbf2c..83e653b 100644 --- a/index.md +++ b/in/index.md @@ -1,60 +1,72 @@ ---- -author: Marc Beninca -date: 2024 / 03 -lang: fr-FR -title: Git PPP -subtitle: Possibilités, Porcelaine & Plomberie ---- +# Concepts -# Possibilités +1. Outils +1. Concepts -# Outils +## Outils -## Hachage +### Hachage ::: incremental * SHA-1 * SHA-256 ::: -## Pointeurs +::: notes +* versions ≥ 2.42 rétro-compatibles +::: + +### DAG / GAO + +::: incremental +* Graphe +* Acyclique +* Orienté +::: + +### Pointeurs * branches * étiquettes -# Concepts +# {-} +## Concepts -## Zones +### Zones ::: incremental * répertoire de travail * index * historique +* réserve ::: -# Porcelaine -## 1 -## 2 +# Commandes -# Porcelaine → Bases +1. Bases +1. Local +1. Collaborer -## git init +## Bases + +### git init * bare | non-bare -## git config +### git config * system → global → local * user name & email * description -## git status +### git status * -u -# Porcelaine → Local +# {-} +## Local -## Commandes +### Commandes * git branch --force * git add @@ -71,16 +83,21 @@ subtitle: Possibilités, Porcelaine & Plomberie * interactive * git reflog -# Porcelaine → Collaborer +# {-} +## Collaborer -## Commandes +### Commandes * git remote | clone * git fetch | pull * git push * git tag -# Plomberie +# Composants + +1. Basique +1. Pointeurs +1. Objets ## Basique @@ -91,6 +108,7 @@ subtitle: Possibilités, Porcelaine & Plomberie * description ::: +# {-} ## Pointeurs * .git/refs/ @@ -101,6 +119,7 @@ subtitle: Possibilités, Porcelaine & Plomberie 1. tags/tag ::: +# {-} ## Objets * .git/objects diff --git a/in/info.md b/in/info.md new file mode 100644 index 0000000..df6dc28 --- /dev/null +++ b/in/info.md @@ -0,0 +1,7 @@ +--- +author: Marc Beninca +date: 2024 / 03 +lang: fr-FR +title: Git CCC +subtitle: Concepts, Commandes, Composants +--- diff --git a/in/plan.md b/in/plan.md new file mode 100644 index 0000000..15531c6 --- /dev/null +++ b/in/plan.md @@ -0,0 +1,21 @@ +# Plan {-} + +::: {.columns} +::: {.column width="33%"} +* Concepts + * Outils + * Concepts +::: +::: {.column width="33%"} +* Commandes + * Bases + * Local + * Collaborer +::: +::: {.column width="33%"} +* Composants + * Basique + * Pointeurs + * Objets +::: +:::