From a8b97dfbaae02ae1e1fca76685b3612e79e6c5b7 Mon Sep 17 00:00:00 2001
From: Daniel Duarte Tojal <daniel.duarte.001@student.uni.lu>
Date: Tue, 27 Aug 2019 09:55:28 +0200
Subject: [PATCH] move rebase -i examples into intro

---
 .../slides/rebase-iExample.md                         | 10 ----------
 2019/2019-09-09_testCourseAdv/slides/rebase-iIntro.md | 11 ++++++++++-
 2 files changed, 10 insertions(+), 11 deletions(-)
 delete mode 100644 2019/2019-09-09_testCourseAdv/slides/rebase-iExample.md

diff --git a/2019/2019-09-09_testCourseAdv/slides/rebase-iExample.md b/2019/2019-09-09_testCourseAdv/slides/rebase-iExample.md
deleted file mode 100644
index 4a6e2fa0..00000000
--- a/2019/2019-09-09_testCourseAdv/slides/rebase-iExample.md
+++ /dev/null
@@ -1,10 +0,0 @@
-## Interactive Rebasing
-
-```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
-```
diff --git a/2019/2019-09-09_testCourseAdv/slides/rebase-iIntro.md b/2019/2019-09-09_testCourseAdv/slides/rebase-iIntro.md
index c9920b85..fbbfc806 100644
--- a/2019/2019-09-09_testCourseAdv/slides/rebase-iIntro.md
+++ b/2019/2019-09-09_testCourseAdv/slides/rebase-iIntro.md
@@ -5,4 +5,13 @@ git rebase -i <branch>
 ```
 
 * Enables more precise control over the rebased commits
-* Before committing many actions are at disposal
\ No newline at end of file
+* 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
-- 
GitLab