From 1e7916a850c4686e5df5913fc5b7a71981aaff63 Mon Sep 17 00:00:00 2001 From: Denny Perez Date: Mon, 13 Oct 2025 19:35:13 -0400 Subject: [PATCH 1/5] feat: es fichas `060`, `061` and `062` --- _posts/2025-09-07-060.md | 2 ++ _posts/2025-09-08-061.md | 2 ++ _posts/2025-09-09-062.md | 2 ++ en/_posts/2025-09-07-060.md | 2 ++ en/_posts/2025-09-08-061.md | 2 ++ en/_posts/2025-09-09-062.md | 2 ++ es/_posts/2025-09-07-060.md | 29 +++++++++++++++++++++++++++++ es/_posts/2025-09-08-061.md | 31 +++++++++++++++++++++++++++++++ es/_posts/2025-09-09-062.md | 26 ++++++++++++++++++++++++++ 9 files changed, 98 insertions(+) create mode 100644 es/_posts/2025-09-07-060.md create mode 100644 es/_posts/2025-09-08-061.md create mode 100644 es/_posts/2025-09-09-062.md diff --git a/_posts/2025-09-07-060.md b/_posts/2025-09-07-060.md index 44880f5a..918ef6e9 100644 --- a/_posts/2025-09-07-060.md +++ b/_posts/2025-09-07-060.md @@ -17,6 +17,8 @@ lang: "pt" translations: - lang: en url: /en/060 +- lang: es + url: /es/060 pv: url: "/projects/059" title: "#059 O que é merge request?" diff --git a/_posts/2025-09-08-061.md b/_posts/2025-09-08-061.md index 27ce3b72..c76165b2 100644 --- a/_posts/2025-09-08-061.md +++ b/_posts/2025-09-08-061.md @@ -19,6 +19,8 @@ lang: "pt" translations: - lang: en url: /en/061 +- lang: es + url: /es/061 pv: url: "/projects/060" title: "#060 git revert 09c6d68" diff --git a/_posts/2025-09-09-062.md b/_posts/2025-09-09-062.md index 6e4c9d37..46b28b44 100644 --- a/_posts/2025-09-09-062.md +++ b/_posts/2025-09-09-062.md @@ -15,6 +15,8 @@ lang: "pt" translations: - lang: en url: /en/062 +- lang: es + url: /es/062 pv: url: "/projects/061" title: "#061 git commit --amend -m 'texto'" diff --git a/en/_posts/2025-09-07-060.md b/en/_posts/2025-09-07-060.md index 21de0dce..94e40e78 100644 --- a/en/_posts/2025-09-07-060.md +++ b/en/_posts/2025-09-07-060.md @@ -16,6 +16,8 @@ lang: "en" translations: - lang: pt url: /projects/060 +- lang: es + url: /es/060 pv: url: "/en/059" title: "#059 What is merge request?" diff --git a/en/_posts/2025-09-08-061.md b/en/_posts/2025-09-08-061.md index ea9fab5c..d874450e 100644 --- a/en/_posts/2025-09-08-061.md +++ b/en/_posts/2025-09-08-061.md @@ -19,6 +19,8 @@ lang: "en" translations: - lang: pt url: /projects/061 +- lang: es + url: /es/061 pv: url: "/en/060" title: "#060 git revert 09c6d68" diff --git a/en/_posts/2025-09-09-062.md b/en/_posts/2025-09-09-062.md index e5d5b277..98e3d9d1 100644 --- a/en/_posts/2025-09-09-062.md +++ b/en/_posts/2025-09-09-062.md @@ -16,6 +16,8 @@ lang: "en" translations: - lang: pt url: /projects/062 +- lang: es + url: /es/062 pv: url: "/en/061" title: "#061 git commit --amend -m 'text'" diff --git a/es/_posts/2025-09-07-060.md b/es/_posts/2025-09-07-060.md new file mode 100644 index 00000000..38b3cc90 --- /dev/null +++ b/es/_posts/2025-09-07-060.md @@ -0,0 +1,29 @@ +--- +layout: post +pretitle: deshaciendo un +title: commit +command: git revert 09c6d68 +descriptors: + - command: Comando para\nun commit + - part1: hash del commit que\nse va a deshacer +info: Un nuevo commit se realizará para deshacer\nlos cambios del commit original +number: "060" +author: "@jtemporal" +mermaid: true +use_static_image: true +permalink: "/es/060" +lang: "es" +translations: +- lang: pt + url: /projects/060 +- lang: en + url: /en/060 +pv: + url: "/es/059" + title: "#059 Que es una merge request?" +nt: + url: "/en/061" + title: "#061 git commit --amend -m 'text'" +--- + +{% include mermaid-graphs.html %} diff --git a/es/_posts/2025-09-08-061.md b/es/_posts/2025-09-08-061.md new file mode 100644 index 00000000..2c3de3a3 --- /dev/null +++ b/es/_posts/2025-09-08-061.md @@ -0,0 +1,31 @@ +--- +layout: post +pretitle: Ajustando el mensaje del último +title: commit +subtitle: sin editor +command: git commit --amend -m 'text' +descriptors: + - command: Comando para crear\nun commit + - part1: opción para ajustar\nel ûtimo commit + - part2: opción para pasar\nel mensaje + - part3: nuevo mensaje del\ncommit +info: esto cambiará el hash del commit\npor lo que se debe usar solo con commits no publicados +author: "@jtemporal" +mermaid: true +use_static_image: true +permalink: "/es/061" +lang: "es" +translations: +- lang: pt + url: /projects/061 +- lang: en + url: /en/061 +pv: + url: "/es/060" + title: "#060 git revert 09c6d68" +nt: + url: "/en/062" + title: "#062 que es el .gitkeep file?" +--- + +{% include mermaid-graphs.html %} \ No newline at end of file diff --git a/es/_posts/2025-09-09-062.md b/es/_posts/2025-09-09-062.md new file mode 100644 index 00000000..55b99bab --- /dev/null +++ b/es/_posts/2025-09-09-062.md @@ -0,0 +1,26 @@ +--- +layout: post +pretitle: Qué es el archivo +title: .gitkeep +subtitle: +concept: true +parts: + - part1: "archivo en blanco para garantizar\nla existencia de una carpeta vacía" + - part2: "Es una convención utilizada por\nla comunidad" +number: "062" +author: "@jtemporal" +mermaid: true +use_static_image: true +permalink: "/es/062" +lang: "es" +translations: +- lang: pt + url: /projects/062 +- lang: en + url: /en/062 +pv: + url: "/es/061" + title: "#061 git commit --amend -m 'text'" +--- + +{% include mermaid-graphs.html %} From 2c9061f3cc256461755d02252a5e96b64205658f Mon Sep 17 00:00:00 2001 From: Denny Perez <38770890+DennyPerez18@users.noreply.github.com> Date: Mon, 13 Oct 2025 19:43:44 -0400 Subject: [PATCH 2/5] add: fichas svg --- assets/img/mermaid/060-es.svg | 87 +++++++++++++++++++++++++++++++++++ assets/img/mermaid/061-es.svg | 87 +++++++++++++++++++++++++++++++++++ assets/img/mermaid/062-es.svg | 87 +++++++++++++++++++++++++++++++++++ 3 files changed, 261 insertions(+) create mode 100644 assets/img/mermaid/060-es.svg create mode 100644 assets/img/mermaid/061-es.svg create mode 100644 assets/img/mermaid/062-es.svg diff --git a/assets/img/mermaid/060-es.svg b/assets/img/mermaid/060-es.svg new file mode 100644 index 00000000..2706c4a6 --- /dev/null +++ b/assets/img/mermaid/060-es.svg @@ -0,0 +1,87 @@ +
hash del commit que
se va a deshacer
git
revert
09c6d68
Comando para
un commit
Un nuevo commit se realizará para deshacer
los cambios del commit original
 \ No newline at end of file diff --git a/assets/img/mermaid/061-es.svg b/assets/img/mermaid/061-es.svg new file mode 100644 index 00000000..3963654c --- /dev/null +++ b/assets/img/mermaid/061-es.svg @@ -0,0 +1,87 @@ +
opción para ajustar
el ûtimo commit
nuevo mensaje del
commit
git
commit
--amend
-m
'text'
Comando para crear
un commit
opción para pasar
el mensaje
esto cambiará el hash del commit
por lo que se debe usar solo con commits no publicados
 \ No newline at end of file diff --git a/assets/img/mermaid/062-es.svg b/assets/img/mermaid/062-es.svg new file mode 100644 index 00000000..14d072d3 --- /dev/null +++ b/assets/img/mermaid/062-es.svg @@ -0,0 +1,87 @@ +
archivo en blanco para garantizar
la existencia de una carpeta vacía
Es una convención utilizada por
la comunidad
 \ No newline at end of file From 7641b424387bca085825c740ee4bceca4a36b518 Mon Sep 17 00:00:00 2001 From: Denny Perez Date: Mon, 13 Oct 2025 19:51:19 -0400 Subject: [PATCH 3/5] fix(061): add missing `number` property --- es/_posts/2025-09-08-061.md | 1 + 1 file changed, 1 insertion(+) diff --git a/es/_posts/2025-09-08-061.md b/es/_posts/2025-09-08-061.md index 2c3de3a3..28d640d4 100644 --- a/es/_posts/2025-09-08-061.md +++ b/es/_posts/2025-09-08-061.md @@ -10,6 +10,7 @@ descriptors: - part2: opción para pasar\nel mensaje - part3: nuevo mensaje del\ncommit info: esto cambiará el hash del commit\npor lo que se debe usar solo con commits no publicados +number: "061" author: "@jtemporal" mermaid: true use_static_image: true From 2728f4a4a647c22bd08ac8773966d7f7f04b6a1d Mon Sep 17 00:00:00 2001 From: Denny Perez Date: Mon, 13 Oct 2025 19:56:15 -0400 Subject: [PATCH 4/5] fix(059): update `nt` to `060` --- es/_posts/2025-09-06-059.md | 4 ++-- es/_posts/2025-09-09-062.md | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/es/_posts/2025-09-06-059.md b/es/_posts/2025-09-06-059.md index 077c85e4..1b207180 100644 --- a/es/_posts/2025-09-06-059.md +++ b/es/_posts/2025-09-06-059.md @@ -22,7 +22,7 @@ pv: url: "/es/058" title: "#058 git commit" nt: - url: "https://gitfichas.com/es" - title: "GitTarjetas" + url: "/es/060" + title: "#060 git revert 09c6d68" --- {% include mermaid-graphs.html %} diff --git a/es/_posts/2025-09-09-062.md b/es/_posts/2025-09-09-062.md index 55b99bab..6461956b 100644 --- a/es/_posts/2025-09-09-062.md +++ b/es/_posts/2025-09-09-062.md @@ -21,6 +21,9 @@ translations: pv: url: "/es/061" title: "#061 git commit --amend -m 'text'" +nt: + url: "https://gitfichas.com" + title: "GitFichas" --- {% include mermaid-graphs.html %} From 969ae8c169467c6b156078b43931480d560e5934 Mon Sep 17 00:00:00 2001 From: Denny Perez <38770890+DennyPerez18@users.noreply.github.com> Date: Tue, 14 Oct 2025 09:30:36 -0400 Subject: [PATCH 5/5] fix: typo --- assets/img/mermaid/060-es.svg | 2 +- es/_posts/2025-09-07-060.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/img/mermaid/060-es.svg b/assets/img/mermaid/060-es.svg index 2706c4a6..d5905ec2 100644 --- a/assets/img/mermaid/060-es.svg +++ b/assets/img/mermaid/060-es.svg @@ -1,4 +1,4 @@ -
hash del commit que
se va a deshacer
git
revert
09c6d68
Comando para
un commit
Un nuevo commit se realizará para deshacer
los cambios del commit original