diff --git a/assets/img/mermaid/031-en.svg b/assets/img/mermaid/031-en.svg new file mode 100644 index 00000000..d361dc0e --- /dev/null +++ b/assets/img/mermaid/031-en.svg @@ -0,0 +1,87 @@ +
flag to fix
last commit
git
commit
--amend
command to
handle commits
\ No newline at end of file diff --git a/assets/img/mermaid/032-en.svg b/assets/img/mermaid/032-en.svg index 075dfcd0..f9db4ed9 100644 --- a/assets/img/mermaid/032-en.svg +++ b/assets/img/mermaid/032-en.svg @@ -1,4 +1,4 @@ -
nombre del archivo
git
restore
name
comando para restaurar
el estado anterior

handle commits + - part1: flag to
fix last commit +info: by default, amend will adjust the last commit
creating a new commit +author: "@jtemporal" +number: "031" +mermaid: true +use_static_image: true permalink: "/en/031" translations: - lang: pt @@ -11,18 +21,10 @@ translations: lang: "en" pv: url: "/en/030" - title: "#030 O que é um conflito?" + title: "#030 What is a conflict?" nt: url: "/en/032" - title: "#032 git restore nome" + title: "#032 git restore name" --- -##### Adjusting the last commit -To adjust the last commit use the command git commit --amend

- -| Command | Description | -|---------|-------------| -| `switch` | Command to handle commits | -| `--amend` | Flag to fix the last commit | -| _extra information_ | By default amend will adjust the last commit creating a new commit | -{: .styled-table} +{% include mermaid-graphs.html %} diff --git a/en/_posts/2022-01-06-032.md b/en/_posts/2022-01-06-032.md index 2eac2859..93021d7d 100644 --- a/en/_posts/2022-01-06-032.md +++ b/en/_posts/2022-01-06-032.md @@ -1,7 +1,17 @@ --- layout: post -title: '#032 git restore name' -image: "https://res.cloudinary.com/jesstemporal/image/upload/f_auto/v1642878600/gitfichas/en/032/thumbnail_j2drhh.jpg" +pretitle: Discarding +title: changes +subtitle: +command: git restore name +descriptors: + - command: command to restore
the previous state + - part1: file name +info: the changes that are
discarded are not on staging +author: "@jtemporal" +number: "032" +mermaid: true +use_static_image: true permalink: "/en/032" translations: - lang: pt @@ -14,15 +24,7 @@ pv: title: "#031 git commit --amend" nt: url: "/en/033" - title: "#033 git clone url nome" + title: "#033 git clone url name" --- -##### Discarding changes -To discard changes to a file that is not on staging use the command git restore name

- -| Command | Description | -|---------|-------------| -| `restore` | Command to restore the previous state | -| `name` | File name | -| _extra information_ | The discarded changes are not added to staging | -{: .styled-table} +{% include mermaid-graphs.html %} diff --git a/en/_posts/2022-01-07-033.md b/en/_posts/2022-01-07-033.md index 1762a708..02e23162 100644 --- a/en/_posts/2022-01-07-033.md +++ b/en/_posts/2022-01-07-033.md @@ -1,7 +1,17 @@ --- layout: post -title: '#033 git clone url name' -image: "https://res.cloudinary.com/jesstemporal/image/upload/f_auto/v1642878600/gitfichas/en/033/thumbnail_wmonzr.jpg" +pretitle: Naming the +title: clone +subtitle: destination folder +command: git clone url name +descriptors: + - command: command to download
the repository + - part1: repository
path + - part2: name of the
target folder +author: "@jtemporal" +number: "033" +mermaid: true +use_static_image: true permalink: "/en/033" translations: - lang: pt @@ -11,18 +21,10 @@ translations: lang: "en" pv: url: "/en/032" - title: "#032 git restore nome" + title: "#032 git restore name" nt: url: "/en/034" - title: "#034 git switch nome" + title: "#034 git switch name" --- -##### Naming the clone folder -To give a specific name to the repository download folder use the command git clone url name

- -| Command | Description | -|---------|-------------| -| `clone` | Command to download the repository | -| `url` | Path to the repository | -| `name` | Name of the target folder | -{: .styled-table} +{% include mermaid-graphs.html %}