From 58da75ca58edeb7b873ab8c89b13e01e26b7f103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Mu=C3=B1oz?= Date: Fri, 31 Oct 2025 04:54:14 +0000 Subject: [PATCH] =?UTF-8?q?Migrate=20en=20cards=20#040=E2=80=93#045=20to?= =?UTF-8?q?=20Mermaid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/img/mermaid/040-en.svg | 47 ++++++++++++++++++++++++++++++++ assets/img/mermaid/041-en.svg | 47 ++++++++++++++++++++++++++++++++ assets/img/mermaid/042-en.svg | 47 ++++++++++++++++++++++++++++++++ assets/img/mermaid/043-en.svg | 47 ++++++++++++++++++++++++++++++++ assets/img/mermaid/044-en.svg | 47 ++++++++++++++++++++++++++++++++ assets/img/mermaid/045-en.svg | 47 ++++++++++++++++++++++++++++++++ en/_posts/2022-01-19-040.md | 42 ++++++++++++----------------- en/_posts/2022-01-20-041.md | 43 ++++++++++++------------------ en/_posts/2022-01-21-042.md | 43 ++++++++++++------------------ en/_posts/2022-01-22-043.md | 44 +++++++++++++----------------- en/_posts/2022-01-23-044.md | 42 ++++++++++++----------------- en/_posts/2022-02-05-045.md | 50 +++++++++++++++-------------------- 12 files changed, 389 insertions(+), 157 deletions(-) create mode 100644 assets/img/mermaid/040-en.svg create mode 100644 assets/img/mermaid/041-en.svg create mode 100644 assets/img/mermaid/042-en.svg create mode 100644 assets/img/mermaid/043-en.svg create mode 100644 assets/img/mermaid/044-en.svg create mode 100644 assets/img/mermaid/045-en.svg diff --git a/assets/img/mermaid/040-en.svg b/assets/img/mermaid/040-en.svg new file mode 100644 index 00000000..d49f53cc --- /dev/null +++ b/assets/img/mermaid/040-en.svg @@ -0,0 +1,47 @@ +
a set of changes saved
into a stack to be used later
the command allows saving the changes made
and returning to a clean state of the working directory
stash index in stash@{n}
 \ No newline at end of file diff --git a/assets/img/mermaid/041-en.svg b/assets/img/mermaid/041-en.svg new file mode 100644 index 00000000..c3635907 --- /dev/null +++ b/assets/img/mermaid/041-en.svg @@ -0,0 +1,47 @@ +
create a
new stash
git
stash
push
command to manage
stashes
push is optional
 \ No newline at end of file diff --git a/assets/img/mermaid/042-en.svg b/assets/img/mermaid/042-en.svg new file mode 100644 index 00000000..89702444 --- /dev/null +++ b/assets/img/mermaid/042-en.svg @@ -0,0 +1,47 @@ +
flag to write
a stash message
git
stash
-m
'changes'
command to manage
stashes
message describing
the changes
 \ No newline at end of file diff --git a/assets/img/mermaid/043-en.svg b/assets/img/mermaid/043-en.svg new file mode 100644 index 00000000..b4d243a2 --- /dev/null +++ b/assets/img/mermaid/043-en.svg @@ -0,0 +1,47 @@ +
show the list
of existing stashes
git
stash
list
command to manage
stashes
 \ No newline at end of file diff --git a/assets/img/mermaid/044-en.svg b/assets/img/mermaid/044-en.svg new file mode 100644 index 00000000..e7ab121b --- /dev/null +++ b/assets/img/mermaid/044-en.svg @@ -0,0 +1,47 @@ +
removes from the pile
and applies changes
git
stash
pop
command to manage
stashes
without passing an index, the most recent stash is used
 \ No newline at end of file diff --git a/assets/img/mermaid/045-en.svg b/assets/img/mermaid/045-en.svg new file mode 100644 index 00000000..1e67d8fb --- /dev/null +++ b/assets/img/mermaid/045-en.svg @@ -0,0 +1,47 @@ +
delete a stash
from the pile
git
stash
drop
stash@{2}
command to manage
stashes
index of the stash
to be deleted
without passing an index, the most recent stash is deleted
 \ No newline at end of file diff --git a/en/_posts/2022-01-19-040.md b/en/_posts/2022-01-19-040.md index f43bd411..bf7b188e 100644 --- a/en/_posts/2022-01-19-040.md +++ b/en/_posts/2022-01-19-040.md @@ -1,13 +1,22 @@ --- layout: post -title: '#040 What is stash?' -image: "https://res.cloudinary.com/jesstemporal/image/upload/v1642964722/gitfichas/en/040/thumbnail_efctyk.jpg" -translations: -- lang: es - url: /es/040 -- lang: pt - url: /projects/040 +pretitle: What is +title: stash +concept: true +parts: + - part1: a set of changes saved
into a stack to be used later + - part2: the command allows saving the changes made
and returning to a clean state of the working directory + - part3: stash index in stash@{n} +number: "040" +author: "@jtemporal" +mermaid: true +use_static_image: true permalink: "/en/040" +translations: + - lang: pt + url: /projects/040 + - lang: es + url: /es/040 lang: "en" pv: url: "/en/039" @@ -17,21 +26,4 @@ nt: title: "#041 git stash push" --- -A stash is a bundle of changes stored to be used later and each stash has an index.

- -| Command | Description | -|---------|-------------| -| `stash` | is a bundle of changes stored into a stack to be used later | -| _why it is useful?_ | the command provides a way for saving the changes made and safely go back to a clean state of the working directory | -| `“n”` em `stash@{n}` | stash index | -{: .styled-table} - - +{% include mermaid-graphs.html %} diff --git a/en/_posts/2022-01-20-041.md b/en/_posts/2022-01-20-041.md index 79b912b2..5039af59 100644 --- a/en/_posts/2022-01-20-041.md +++ b/en/_posts/2022-01-20-041.md @@ -1,13 +1,22 @@ --- layout: post -title: '#041 git stash push' -image: "https://res.cloudinary.com/jesstemporal/image/upload/v1642964722/gitfichas/en/041/thumbnail_uu3g28.jpg" -translations: -- lang: pt - url: /projects/041 -- lang: es - url: /es/041 +pretitle: Saving changes +title: for later +command: git stash push +descriptors: + - command: command to manage \nstashes + - part1: create a \nnew stash +info: "push is optional" +number: "041" +author: "@jtemporal" +mermaid: true +use_static_image: true permalink: "/en/041" +translations: + - lang: pt + url: /projects/041 + - lang: es + url: /es/041 lang: "en" pv: url: "/en/040" @@ -16,23 +25,5 @@ nt: url: "/en/042" title: "#042 git stash -m “changes”" --- -##### Saving changes for later - -To create a stash, use the command git stash push.

- -| Command | Description | -|---------|-------------| -| `stash` | command to manage stashes | -| `push` | command to creta a new stash | -| _extra information_ | the push command can be omitted | -{: .styled-table} - - +{% include mermaid-graphs.html %} diff --git a/en/_posts/2022-01-21-042.md b/en/_posts/2022-01-21-042.md index ebfe8176..41aec613 100644 --- a/en/_posts/2022-01-21-042.md +++ b/en/_posts/2022-01-21-042.md @@ -1,13 +1,22 @@ --- layout: post -title: '#042 git stash -m “changes”' -image: "https://res.cloudinary.com/jesstemporal/image/upload/v1693392223/gitfichas/en/042/thumbnail_yzjbbg.jpg" -translations: -- lang: pt - url: /projects/042 -- lang: es - url: /es/042 +pretitle: Naming a +title: stash +command: git stash -m 'changes' +descriptors: + - command: command to manage \nstashes + - part1: flag to write \na stash message + - part2: message describing \nthe changes +author: "@jtemporal" +number: "042" +mermaid: true +use_static_image: true permalink: "/en/042" +translations: + - lang: pt + url: /projects/042 + - lang: es + url: /es/042 lang: "en" pv: url: "/en/041" @@ -16,23 +25,5 @@ nt: url: "/en/043" title: "#043 git stash list" --- -##### Naming a stash - -To create a 'named' stash, use the command git stash -m followed by the message describing the stash.

- -| Command | Description | -|---------|-------------| -| `stash` | command to manage stashes | -| `-m` | flag write a stash message | -| `“changes”` | message describing the changes | -{: .styled-table} - - +{% include mermaid-graphs.html %} diff --git a/en/_posts/2022-01-22-043.md b/en/_posts/2022-01-22-043.md index f4c99670..7a6b1a6e 100644 --- a/en/_posts/2022-01-22-043.md +++ b/en/_posts/2022-01-22-043.md @@ -1,37 +1,29 @@ --- layout: post -title: '#043 git stash list' -image: "https://res.cloudinary.com/jesstemporal/image/upload/v1642964722/gitfichas/en/043/thumbnail_rclvmu.jpg" -translations: -- lang: pt - url: /projects/043 -- lang: es - url: /es/043 +pretitle: How to +title: list stashes +command: git stash list +descriptors: + - command: command to manage \nstashes + - part1: show the list \nof existing stashes +info: "" +author: "@jtemporal" +number: "043" +mermaid: true +use_static_image: true permalink: "/en/043" +translations: + - lang: pt + url: /projects/043 + - lang: es + url: /es/043 lang: "en" pv: url: "/en/042" - title: "#042 git stash -m “changes”" + title: "#042 git stash -m 'changes'" nt: url: "/en/044" title: "#044 git stash pop" --- -##### How to list existing stash entries - -To list stash entreis, use the command git stash list.

- -| Command | Description | -|---------|-------------| -| `stash` | command to manage stashes | -| `list` | command to show the list of stashes | -{: .styled-table} - - +{% include mermaid-graphs.html %} diff --git a/en/_posts/2022-01-23-044.md b/en/_posts/2022-01-23-044.md index a9c5eb99..2df629fa 100644 --- a/en/_posts/2022-01-23-044.md +++ b/en/_posts/2022-01-23-044.md @@ -1,12 +1,22 @@ --- layout: post -title: '#044 git stash pop' -image: "https://res.cloudinary.com/jesstemporal/image/upload/v1642964723/gitfichas/en/044/thumbnail_qscsac.jpg" +pretitle: +title: Removing +subtitle: a stash from the pile and applying it +command: git stash pop +descriptors: + - command: command to manage \nstashes + - part1: removes from the pile \nand applies changes +info: without passing an index, the most recent stash is used +author: "@jtemporal" +number: "044" +mermaid: true +use_static_image: true translations: -- lang: pt - url: /projects/044 -- lang: es - url: /es/044 + - lang: pt + url: /projects/044 + - lang: es + url: /es/044 permalink: "/en/044" lang: "en" pv: @@ -16,23 +26,5 @@ nt: url: "/en/045" title: "#045 git stash drop stash@{2}" --- -##### Removing a stash from the pile and applying it -To remove a stash entry from the pile and apply the changes it contains at the same time, use the command git stash pop

- -| Command | Description | -|---------|-------------| -| `stash` | command to manage stashes | -| `pop` | removes a stash from the pile and apply the changes | -| _extra information_ | without passing an index the most recent stash is used | -{: .styled-table} - - +{% include mermaid-graphs.html %} diff --git a/en/_posts/2022-02-05-045.md b/en/_posts/2022-02-05-045.md index d84a3428..e0d1eaf3 100644 --- a/en/_posts/2022-02-05-045.md +++ b/en/_posts/2022-02-05-045.md @@ -1,39 +1,31 @@ --- layout: post -title: '#045 git stash drop stash@{2}' -image: "https://res.cloudinary.com/jesstemporal/image/upload/v1644148962/gitfichas/en/045/thumbnail_nchzol.jpg" -translations: -- lang: pt - url: /projects/045 -- lang: es - url: /es/045 +pretitle: +title: Deleting +subtitle: a specific stash +command: git stash drop stash@{2} +descriptors: + - command: command to manage \nstashes + - part1: delete a stash \nfrom the pile + - part2: index of the stash \nto be deleted +info: without passing an index, the most recent stash is deleted +author: "@jtemporal" +number: "045" +mermaid: true +use_static_image: true permalink: "/en/045" +translations: + - lang: pt + url: /projects/045 + - lang: es + url: /es/045 lang: "en" -previous: +pv: url: "/en/044" title: "#044 git stash pop" -next: +nt: url: "/en/046" title: "#046 git stash apply stash@{2}" --- -##### Throwing out a stash - -To remove a stash entry from the pile, use the command git stash drop followed by the stash name

- -| Command | Description | -|---------|-------------| -| `stash` | command to manage stashes | -| `drop` | removes a stash from the pile | -| `stash@{1}` | second to last stash | -| _extra information_ | without passing an index the most recent stash is used | -{: .styled-table} - - +{% include mermaid-graphs.html %}