Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions docs/apunts/01_introduccio/transparencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ https://gitlab.com

## Estructura d'un repositori

<img src="../img/components.png">
<img src="../img/components.light.png">

---

Expand Down Expand Up @@ -80,7 +80,7 @@ git init
git add <path>
```

<img src="../img/staged_readme.png">
<img src="../img/staged_readme.light.png">

---

Expand All @@ -90,7 +90,7 @@ git add <path>
git commit [-m <message>]
```

<img src="../img/after_commit_readme.png">
<img src="../img/after_commit_readme.light.png">

---

Expand Down Expand Up @@ -122,7 +122,7 @@ git show [ref]
git diff [--staged]
```

<img src="../img//resum_diff.png">
<img src="../img//resum_diff.light.png">

---

Expand All @@ -133,7 +133,7 @@ git diff [--staged]
git restore <files>
```

<img src="../img/flux_treball.png" height="450px">
<img src="../img/flux_treball.light.png" height="450px">

---

Expand Down
4 changes: 2 additions & 2 deletions docs/apunts/03_remots/transparencies_auth.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ alias: auth-slides

## Repositori remot

<img class="r-stretch" src="../../01_introduccio/img/components.png">
<img class="r-stretch" src="../../01_introduccio/img/components.light.png">

---

## Desenvolupament distribuït

<img class="r-stretch" src="../img/multiple_local_repo.png">
<img class="r-stretch" src="../img/multiple_local_repo.light.png">

---

Expand Down
12 changes: 6 additions & 6 deletions docs/apunts/03_remots/transparencies_remots.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ alias: remots-slides

## Repositori remot

<img class="r-stretch" src="../../01_introduccio/img/components.png">
<img class="r-stretch" src="../../01_introduccio/img/components.light.png">

---

## Desenvolupament distribuït

<img class="r-stretch" src="../img/multiple_local_repo.png">
<img class="r-stretch" src="../img/multiple_local_repo.light.png">

---

Expand All @@ -32,7 +32,7 @@ git remote add origin <url>
- (_HTTPS_) Personal Access Token (PAT)
- (_SSH_) Clau SSH

<img class="r-stretch" src="../img/add_remote.png" alt="Repsitori Local vinculat amb un Repositori Remot">
<p><img class="r-stretch" src="../img/add_remote.light.png" alt="Repsitori Local vinculat amb un Repositori Remot"></p>

---

Expand All @@ -52,7 +52,7 @@ git push [-u | --set-upstream] origin <branca>
git clone <url> [<directori>]
```

<img class="r-stretch" src="../img/clone.png">
<img class="r-stretch" src="../img/clone.light.png">

---

Expand All @@ -61,7 +61,7 @@ git clone <url> [<directori>]
```bash
git fetch
```
<img class="r-stretch" src="../img/fetch.png">
<img class="r-stretch" src="../img/fetch.light.png">

---

Expand All @@ -71,4 +71,4 @@ git fetch
git pull [--rebase]
```

<img class="r-stretch" src="../img/pull.png">
<img class="r-stretch" src="../img/pull.light.png">
18 changes: 9 additions & 9 deletions docs/apunts/05_estrategies/transparencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,54 +31,54 @@ alias: estrategies-slides

## Branca principal i desenvolupament

<img class="r-stretch" src="../img/main-develop.png" alt="Branques main i develop">
<img class="r-stretch" src="../img/main-develop.light.png" alt="Branques main i develop">

---

## Branques de funcionalitat

<img class="r-stretch" src="../img/feature.png" alt="Branques de funcionalitat">
<img class="r-stretch" src="../img/feature.light.png" alt="Branques de funcionalitat">

---

## `merge --no-ff`

<img class="r-stretch" src="../img/merge_no_ff.png" alt="Integració amb merge --no-ff">
<img class="r-stretch" src="../img/merge_no_ff.light.png" alt="Integració amb merge --no-ff">

---

## `rebase + merge --ff-only`

<img class="r-stretch" src="../img/rebase_merge_ff.png" alt="Integració amb rebase i merge --ff-only">
<img class="r-stretch" src="../img/rebase_merge_ff.light.png" alt="Integració amb rebase i merge --ff-only">

---

## `rebase + merge --no-ff`

<img class="r-stretch" src="../img/rebase_merge_no_ff.png" alt="Integració amb rebase i merge --no-ff">
<img class="r-stretch" src="../img/rebase_merge_no_ff.light.png" alt="Integració amb rebase i merge --no-ff">

---

<!-- .slide: data-transition="fade-out" -->
## `merge --squash`

<img class="r-stretch" src="../img/merge_squash.png" alt="Integració amb merge --squash">
<img class="r-stretch" src="../img/merge_squash.light.png" alt="Integració amb merge --squash">

--

<!-- .slide: data-transition="fade" -->
## `merge --no-ff + merge --squash`

<img class="r-stretch" src="../img/merge_no_ff_squash.png" alt="Integració amb merge --no-ff i merge --squash">
<img class="r-stretch" src="../img/merge_no_ff_squash.light.png" alt="Integració amb merge --no-ff i merge --squash">

---

## Branques de llançament

<img class="r-stretch" src="../img/release.png" alt="Branques de llançament">
<img class="r-stretch" src="../img/release.light.png" alt="Branques de llançament">

---

## Branques de correcció

<img class="r-stretch" src="../img/hotfix.png" alt="Branques de correcció">
<img class="r-stretch" src="../img/hotfix.light.png" alt="Branques de correcció">
Loading