From 81c19a90af8fcf770ff796e922f711713ed534fd Mon Sep 17 00:00:00 2001
From: Ekaitz Zarraga <ekaitz@elenq.tech>
Date: Mon, 30 May 2022 21:36:32 +0200
Subject: resets ftw

---
 2.md                   |  75 +++++++++++++++++++++++++++++++++++++++++++++++++
 img/reset-ex1.png      | Bin 0 -> 12174 bytes
 img/reset-ex2.png      | Bin 0 -> 15545 bytes
 img/reset-ex3.png      | Bin 0 -> 20739 bytes
 img/reset-ex4.png      | Bin 0 -> 20618 bytes
 img/reset-ex5.png      | Bin 0 -> 20740 bytes
 img/reset-ex6.png      | Bin 0 -> 23975 bytes
 img/reset-ex7.png      |   0
 img/reset-hard.png     | Bin 0 -> 29415 bytes
 img/reset-mixed.png    | Bin 0 -> 29421 bytes
 img/reset-soft.png     | Bin 0 -> 28551 bytes
 img/reset-start.png    | Bin 0 -> 24729 bytes
 img/reset-workflow.png | Bin 0 -> 14024 bytes
 13 files changed, 75 insertions(+)
 create mode 100644 img/reset-ex1.png
 create mode 100644 img/reset-ex2.png
 create mode 100644 img/reset-ex3.png
 create mode 100644 img/reset-ex4.png
 create mode 100644 img/reset-ex5.png
 create mode 100644 img/reset-ex6.png
 create mode 100644 img/reset-ex7.png
 create mode 100644 img/reset-hard.png
 create mode 100644 img/reset-mixed.png
 create mode 100644 img/reset-soft.png
 create mode 100644 img/reset-start.png
 create mode 100644 img/reset-workflow.png

diff --git a/2.md b/2.md
index 967be9a..a468b56 100644
--- a/2.md
+++ b/2.md
@@ -237,3 +237,78 @@ dituzte.
     - `-S` *pikeaxe* funtzioa
     - `-L` lerroen eboluzioa edo funtzioaren eboluzioa erakusten du
 
+## Historia berridazten
+
+- `git commit --amend` mini-rebase baten eragina dauka
+- `git rebase -i|--interactive <commit>` aukeratutako commitera ailegatzeko
+  behar diren commitak aldatu.  
+  Editorearen bitartez commit bakoitzarekin zer egin behar duen adierazi ahal
+  zaio: commitak batu, aukeratu, mezua berridatzi, editatu... Aukera batzuek
+  prozesua gelditzen dute. `git rebase --continue` egiten aurrera jarraitzen
+  da, edo `--abort` egiten prozesua ezeztatzen da. Komandoak berak oso ondo
+  azaltzen du nola egin.
+
+> KONTUZ: N+1 commit aldatu emaitza gutxienez commit bat behar duelako
+
+- `git filter-branch` eta antzeko tresnek aldaketa sakonak egin ditzakete.
+  Adibidez, fitxategi bat commit *guztietatik* kendu.
+
+## Reset eta checkout sakonki — I
+
+Reset eta Checkout ulertzeko Giten fitxategien egoerak eta haien arteko
+trantsizioak ondo ulertu behar dira. Hiru egoera posible daude:
+
+1. HEAD: repositorioaren azkeneko commitaren snapshota
+2. Index: *staging area*, hurrengo commitaren proposamena
+3. Working Directory: Aldaketak egiten ditugun lekua
+
+![Egoren arteko trantsizioak](img/reset-workflow.png){height=150px}
+
+## Reset eta checkout sakonki — II
+
+- `git reset`-ek hiru modu ditu:
+    - `--soft`: HEAD-ak apuntatzen duen adarra mugitu
+    - `--mixed`: `--soft` + aldaketak indexera pasatu
+    - `--hard`: `--mixed` + aldaketak working direktory-ra pasatu, bertako
+      aldaketak zapalduz
+
+
+## Reset eta checkout sakonki — III
+
+![&nbsp;](img/reset-ex1.png)
+
+## Reset eta checkout sakonki — IV
+
+![&nbsp;](img/reset-ex2.png)
+
+## Reset eta checkout sakonki — V
+
+![&nbsp;](img/reset-ex3.png)
+
+## Reset eta checkout sakonki — VI
+
+![&nbsp;](img/reset-ex4.png)
+
+## Reset eta checkout sakonki — VII
+
+![&nbsp;](img/reset-ex5.png)
+
+## Reset eta checkout sakonki — VIII
+
+![&nbsp;](img/reset-ex6.png)
+
+## Reset eta checkout sakonki — IX
+
+![Commit gehiago gehituta](img/reset-start.png)
+
+## Reset eta checkout sakonki — IX
+
+![&nbsp;](img/reset-soft.png)
+
+## Reset eta checkout sakonki — X
+
+![&nbsp;](img/reset-mixed.png)
+
+## Reset eta checkout sakonki — XI
+
+![&nbsp;](img/reset-hard.png)
diff --git a/img/reset-ex1.png b/img/reset-ex1.png
new file mode 100644
index 0000000..2ffd68b
Binary files /dev/null and b/img/reset-ex1.png differ
diff --git a/img/reset-ex2.png b/img/reset-ex2.png
new file mode 100644
index 0000000..f4ffd2a
Binary files /dev/null and b/img/reset-ex2.png differ
diff --git a/img/reset-ex3.png b/img/reset-ex3.png
new file mode 100644
index 0000000..7427493
Binary files /dev/null and b/img/reset-ex3.png differ
diff --git a/img/reset-ex4.png b/img/reset-ex4.png
new file mode 100644
index 0000000..3cfbf7f
Binary files /dev/null and b/img/reset-ex4.png differ
diff --git a/img/reset-ex5.png b/img/reset-ex5.png
new file mode 100644
index 0000000..c21a253
Binary files /dev/null and b/img/reset-ex5.png differ
diff --git a/img/reset-ex6.png b/img/reset-ex6.png
new file mode 100644
index 0000000..c64cc38
Binary files /dev/null and b/img/reset-ex6.png differ
diff --git a/img/reset-ex7.png b/img/reset-ex7.png
new file mode 100644
index 0000000..e69de29
diff --git a/img/reset-hard.png b/img/reset-hard.png
new file mode 100644
index 0000000..a9da7ce
Binary files /dev/null and b/img/reset-hard.png differ
diff --git a/img/reset-mixed.png b/img/reset-mixed.png
new file mode 100644
index 0000000..0266fe5
Binary files /dev/null and b/img/reset-mixed.png differ
diff --git a/img/reset-soft.png b/img/reset-soft.png
new file mode 100644
index 0000000..831d9f6
Binary files /dev/null and b/img/reset-soft.png differ
diff --git a/img/reset-start.png b/img/reset-start.png
new file mode 100644
index 0000000..70b3fb0
Binary files /dev/null and b/img/reset-start.png differ
diff --git a/img/reset-workflow.png b/img/reset-workflow.png
new file mode 100644
index 0000000..1c01e0d
Binary files /dev/null and b/img/reset-workflow.png differ
-- 
cgit v1.2.3