combining slides

2019/2019-09-24_advancedGitTraining/slides/headRebase-iPresentation.md

-# Practical: Amending with Git Rebase
-
-```bash
-$ git rebase -i HEAD~3
-```
\ No newline at end of file

2019/2019-09-24_advancedGitTraining/slides/headRebase-iIntro.md → 2019/2019-09-24_advancedGitTraining/slides/headRebase.md

@@ -4,4 +4,12 @@
 
 * The flag HEAD~X will let you amend the X previous commits instead of just the last one
 
-* In the Interactive rebase menu, be sure to select the `edit` option.
\ No newline at end of file
+* In the Interactive rebase menu, be sure to select the `edit` option.
+
+
+
+# Practical: Amending with Git Rebase
+
+```bash
+$ git rebase -i HEAD~3
+```
\ No newline at end of file

2019/2019-09-24_advancedGitTraining/slides/list.json

@@ -4,8 +4,7 @@
     { "filename": "gettingStarted.md" },
     { "filename": "rebaseIntro.md" },
     { "filename": "rebasePresentation.md" },
-    { "filename": "rebase-iIntro.md" },
-    { "filename": "rebase-iPresentation.md" },
+    { "filename": "rebase.md" },
     { "filename": "chPickIntro.md" },
     { "filename": "chPickPresentation.md" },
     { "filename": "revertIntro.md" },
@@ -14,8 +13,7 @@
     { "filename": "resetPresentation.md" },
     { "filename": "amendIntro.md" },
     { "filename": "amendPresentation.md" },
-    { "filename": "headRebase-iIntro.md" },
-    { "filename": "headRebase-iPresentation.md" },
+    { "filename": "headRebase.md" },
     { "filename": "mergeIntro.md" },
     { "filename": "mergePresentation.md" },
     { "filename": "conflictIntro.md" },

2019/2019-09-24_advancedGitTraining/slides/rebase-iIntro.md

-# Theory: Git Interactive Rebasing
-
-```bash
-git rebase -i <branch>
-```
-
-* Enables more precise control over the rebased commits
-* Before committing many actions are at disposal
-
-```bash
-#  p, pick = use commit
-#  r, reword = use commit, but edit the commit message
-#  e, edit = use commit, but stop for amending
-#  s, squash = use commit, but meld into previous commit
-#  f, fixup = like "squash", but discard this commit's log message
-#  x, exec = run command (the rest of the line) using shell
-```
\ No newline at end of file

2019/2019-09-24_advancedGitTraining/slides/rebase-iPresentation.md → 2019/2019-09-24_advancedGitTraining/slides/rebase.md

+# Theory: Git Interactive Rebasing
+
+```bash
+git rebase -i <branch>
+```
+
+* Enables more precise control over the rebased commits
+* Before committing many actions are at disposal
+
+```bash
+#  p, pick = use commit
+#  r, reword = use commit, but edit the commit message
+#  e, edit = use commit, but stop for amending
+#  s, squash = use commit, but meld into previous commit
+#  f, fixup = like "squash", but discard this commit's log message
+#  x, exec = run command (the rest of the line) using shell
+```
+
+
+
 # Practical: Git Interactive Rebasing
 
 * Create and switch to your own branch