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