From 95624f9e10bea0014be9237f949f9848f5dd9999 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 28 Feb 2024 20:46:29 +0100 Subject: [PATCH 01/10] 1 --- index.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/index.md b/index.md index 07fbf2c..e2b49ec 100644 --- a/index.md +++ b/index.md @@ -8,23 +8,27 @@ subtitle: Possibilités, Porcelaine & Plomberie # Possibilités -# Outils +1. Outils +1. Concepts -## Hachage +## Outils + +### Hachage ::: incremental * SHA-1 * SHA-256 ::: -## Pointeurs +### Pointeurs * branches * étiquettes -# Concepts +# {-} +## Concepts -## Zones +### Zones ::: incremental * répertoire de travail From 97db88b3eb7e12a9ab4796ed0d82203a6ed95024 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 28 Feb 2024 20:49:00 +0100 Subject: [PATCH 02/10] 2,3 --- index.md | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/index.md b/index.md index e2b49ec..b4916f3 100644 --- a/index.md +++ b/index.md @@ -37,28 +37,27 @@ subtitle: Possibilités, Porcelaine & Plomberie ::: # Porcelaine -## 1 -## 2 -# 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 -# Porcelaine → Local +# {-} +## Local -## Commandes +### Commandes * git branch --force * git add @@ -75,9 +74,10 @@ subtitle: Possibilités, Porcelaine & Plomberie * interactive * git reflog -# Porcelaine → Collaborer +# {-} +## Collaborer -## Commandes +### Commandes * git remote | clone * git fetch | pull @@ -95,6 +95,7 @@ subtitle: Possibilités, Porcelaine & Plomberie * description ::: +# {-} ## Pointeurs * .git/refs/ @@ -105,6 +106,7 @@ subtitle: Possibilités, Porcelaine & Plomberie 1. tags/tag ::: +# {-} ## Objets * .git/objects From 098a1eef70215065924284552de3b91efe6022c3 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 28 Feb 2024 20:55:43 +0100 Subject: [PATCH 03/10] 2,3 --- index.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/index.md b/index.md index b4916f3..b23f21a 100644 --- a/index.md +++ b/index.md @@ -38,6 +38,10 @@ subtitle: Possibilités, Porcelaine & Plomberie # Porcelaine +1. Bases +1. Local +1. Collaborer + ## Bases ### git init @@ -86,6 +90,10 @@ subtitle: Possibilités, Porcelaine & Plomberie # Plomberie +1. Basique +1. Pointeurs +1. Objets + ## Basique * .git/ From 41bd326fefee184b29cba1d221c0ad2bd6e0033c Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Wed, 28 Feb 2024 21:39:48 +0100 Subject: [PATCH 04/10] plan --- index.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/index.md b/index.md index b23f21a..defc59e 100644 --- a/index.md +++ b/index.md @@ -6,6 +6,28 @@ title: Git PPP subtitle: Possibilités, Porcelaine & Plomberie --- +# Plan {-} + +::: {.columns} +::: {.column width="33%"} +* Possibilités + * Outils + * Concepts +::: +::: {.column width="33%"} +* Porcelaine + * Bases + * Local + * Collaborer +::: +::: {.column width="33%"} +* Plomberie + * Basique + * Pointeurs + * Objets +::: +::: + # Possibilités 1. Outils From 5561837122ef700fa68b6fa0730d24ec59e8f4b9 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 29 Feb 2024 14:27:26 +0100 Subject: [PATCH 05/10] notes --- index.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/index.md b/index.md index defc59e..03c8992 100644 --- a/index.md +++ b/index.md @@ -42,6 +42,10 @@ subtitle: Possibilités, Porcelaine & Plomberie * SHA-256 ::: +::: notes +* versions ≥ 2.42 rétro-compatibles +::: + ### Pointeurs * branches From ceb3de94f0f9730f975e750825e80cf70f9075a2 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 29 Feb 2024 16:11:19 +0100 Subject: [PATCH 06/10] multi-input --- build.sh | 9 ++++++++- in.txt | 3 +++ index.md => in/index.md | 30 ------------------------------ in/info.md | 7 +++++++ in/plan.md | 21 +++++++++++++++++++++ 5 files changed, 39 insertions(+), 31 deletions(-) create mode 100644 in.txt rename index.md => in/index.md (77%) create mode 100644 in/info.md create mode 100644 in/plan.md diff --git a/build.sh b/build.sh index 80fe371..2333e3a 100755 --- a/build.sh +++ b/build.sh @@ -2,11 +2,17 @@ FILE="$(realpath "${BASH_SOURCE[0]}")" ROOT="$(dirname "${FILE}")" +INPUT="${ROOT}/in" OUTPUT="${ROOT}/out" rm --force --recursive "${OUTPUT}" mkdir --parents "${OUTPUT}" +FILES=() +for f in $(cat "${ROOT}/in.txt") ; do + FILES+=("${INPUT}/${f}.md") +done + pandoc \ --verbose \ --standalone \ @@ -20,4 +26,5 @@ pandoc \ --write 'revealjs' \ --variable revealjs-url='/sw/revealjs/up' \ --variable slideNumber \ -"${ROOT}/index.md" +\ +"${FILES[@]}" 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 77% rename from index.md rename to in/index.md index 03c8992..6b38711 100644 --- a/index.md +++ b/in/index.md @@ -1,33 +1,3 @@ ---- -author: Marc Beninca -date: 2024 / 03 -lang: fr-FR -title: Git PPP -subtitle: Possibilités, Porcelaine & Plomberie ---- - -# Plan {-} - -::: {.columns} -::: {.column width="33%"} -* Possibilités - * Outils - * Concepts -::: -::: {.column width="33%"} -* Porcelaine - * Bases - * Local - * Collaborer -::: -::: {.column width="33%"} -* Plomberie - * Basique - * Pointeurs - * Objets -::: -::: - # Possibilités 1. Outils diff --git a/in/info.md b/in/info.md new file mode 100644 index 0000000..f1b73d5 --- /dev/null +++ b/in/info.md @@ -0,0 +1,7 @@ +--- +author: Marc Beninca +date: 2024 / 03 +lang: fr-FR +title: Git PPP +subtitle: Possibilités, Porcelaine & Plomberie +--- diff --git a/in/plan.md b/in/plan.md new file mode 100644 index 0000000..c983b25 --- /dev/null +++ b/in/plan.md @@ -0,0 +1,21 @@ +# Plan {-} + +::: {.columns} +::: {.column width="33%"} +* Possibilités + * Outils + * Concepts +::: +::: {.column width="33%"} +* Porcelaine + * Bases + * Local + * Collaborer +::: +::: {.column width="33%"} +* Plomberie + * Basique + * Pointeurs + * Objets +::: +::: From 4a70b86591c7b0631f7f8642a681576d60026b75 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 29 Feb 2024 16:13:59 +0100 Subject: [PATCH 07/10] inputs --- build.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 2333e3a..7a02b0c 100755 --- a/build.sh +++ b/build.sh @@ -3,14 +3,18 @@ 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}" -FILES=() -for f in $(cat "${ROOT}/in.txt") ; do - FILES+=("${INPUT}/${f}.md") +for file in $(cat "${INPUTS}") ; do + files+=("${INPUT}/${f}.md") done pandoc \ @@ -27,4 +31,8 @@ pandoc \ --variable revealjs-url='/sw/revealjs/up' \ --variable slideNumber \ \ -"${FILES[@]}" +"${files[@]}" + +} + +main From 7e7d98870cd74c4963515d0f38570f36a572bdaa Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 29 Feb 2024 16:14:23 +0100 Subject: [PATCH 08/10] file --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 7a02b0c..b963aca 100755 --- a/build.sh +++ b/build.sh @@ -14,7 +14,7 @@ rm --force --recursive "${OUTPUT}" mkdir --parents "${OUTPUT}" for file in $(cat "${INPUTS}") ; do - files+=("${INPUT}/${f}.md") + files+=("${INPUT}/${file}.md") done pandoc \ From 038566099dea80407fd425ff77dbd03b06f94bee Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 10 Mar 2024 21:09:43 +0100 Subject: [PATCH 09/10] ccc --- in/index.md | 6 +++--- in/info.md | 4 ++-- in/plan.md | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/in/index.md b/in/index.md index 6b38711..dbb4723 100644 --- a/in/index.md +++ b/in/index.md @@ -1,4 +1,4 @@ -# Possibilités +# Concepts 1. Outils 1. Concepts @@ -32,7 +32,7 @@ * historique ::: -# Porcelaine +# Commandes 1. Bases 1. Local @@ -84,7 +84,7 @@ * git push * git tag -# Plomberie +# Composants 1. Basique 1. Pointeurs diff --git a/in/info.md b/in/info.md index f1b73d5..df6dc28 100644 --- a/in/info.md +++ b/in/info.md @@ -2,6 +2,6 @@ author: Marc Beninca date: 2024 / 03 lang: fr-FR -title: Git PPP -subtitle: Possibilités, Porcelaine & Plomberie +title: Git CCC +subtitle: Concepts, Commandes, Composants --- diff --git a/in/plan.md b/in/plan.md index c983b25..15531c6 100644 --- a/in/plan.md +++ b/in/plan.md @@ -2,18 +2,18 @@ ::: {.columns} ::: {.column width="33%"} -* Possibilités +* Concepts * Outils * Concepts ::: ::: {.column width="33%"} -* Porcelaine +* Commandes * Bases * Local * Collaborer ::: ::: {.column width="33%"} -* Plomberie +* Composants * Basique * Pointeurs * Objets From a2c2ea192057e602a1438ea675257f2e505b65f8 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Sun, 10 Mar 2024 21:35:56 +0100 Subject: [PATCH 10/10] add --- in/index.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/in/index.md b/in/index.md index dbb4723..83e653b 100644 --- a/in/index.md +++ b/in/index.md @@ -16,6 +16,14 @@ * versions ≥ 2.42 rétro-compatibles ::: +### DAG / GAO + +::: incremental +* Graphe +* Acyclique +* Orienté +::: + ### Pointeurs * branches @@ -30,6 +38,7 @@ * répertoire de travail * index * historique +* réserve ::: # Commandes