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 4a6e2fa041b0b8517ec90c0ddd578bddb8dfac93..0000000000000000000000000000000000000000 --- 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 c9920b85f013bc22380311369e220fde7ad9fe4d..fbbfc806044742b9d066d275e5c9617141d66f54 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