From 61d3500d01f5f6510f9436a2e90eab877d015407 Mon Sep 17 00:00:00 2001 From: Daniel Duarte Tojal <daniel.duarte.001@student.uni.lu> Date: Mon, 26 Aug 2019 12:54:53 +0200 Subject: [PATCH] fix spacing/typos --- 2019/2019-09-09_testCourseAdv/slides/rebase-iIntro.md | 2 +- .../slides/rebase-iPresentation4.md | 2 +- 2019/2019-09-09_testCourseAdv/slides/rebaseExample.md | 2 +- 2019/2019-09-09_testCourseAdv/slides/rebaseIntro.md | 8 ++++---- .../2019-09-09_testCourseAdv/slides/rebasePresentation.md | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/2019/2019-09-09_testCourseAdv/slides/rebase-iIntro.md b/2019/2019-09-09_testCourseAdv/slides/rebase-iIntro.md index d3977105..c9920b85 100644 --- a/2019/2019-09-09_testCourseAdv/slides/rebase-iIntro.md +++ b/2019/2019-09-09_testCourseAdv/slides/rebase-iIntro.md @@ -2,7 +2,7 @@ ```bash 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 diff --git a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation4.md b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation4.md index de5cf6d9..3eacea18 100644 --- a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation4.md +++ b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation4.md @@ -1,6 +1,6 @@ ## Interactive Rebase Workshop -* Perform an interactive rebase onto the master branch +* Perform an interactive rebase onto the master branch ```bash git rebase -i master diff --git a/2019/2019-09-09_testCourseAdv/slides/rebaseExample.md b/2019/2019-09-09_testCourseAdv/slides/rebaseExample.md index 5aa6a82e..56f39deb 100644 --- a/2019/2019-09-09_testCourseAdv/slides/rebaseExample.md +++ b/2019/2019-09-09_testCourseAdv/slides/rebaseExample.md @@ -1,6 +1,6 @@ ## Rebasing -* Develop branch is several commits ahead of master. +* Develop branch is several commits ahead of master. * Commits implemented into master that aren't in develop. **image showing master branch and branch A, but master went ahead, but commits are shown** \ No newline at end of file diff --git a/2019/2019-09-09_testCourseAdv/slides/rebaseIntro.md b/2019/2019-09-09_testCourseAdv/slides/rebaseIntro.md index 86db5f3d..281c1d2e 100644 --- a/2019/2019-09-09_testCourseAdv/slides/rebaseIntro.md +++ b/2019/2019-09-09_testCourseAdv/slides/rebaseIntro.md @@ -1,9 +1,9 @@ ## Rebasing -* Git rebase is a great and handy tool -* Straightens the workflow -* Avoid discrepancies when multiple people work on the same project +* Git rebase is a great and handy tool +* Straightens the workflow +* Avoid discrepancies when multiple people work on the same project -Imagine the following situation: +Imagine the following situation: **image showing master branch and branch A, but master went ahead** \ No newline at end of file diff --git a/2019/2019-09-09_testCourseAdv/slides/rebasePresentation.md b/2019/2019-09-09_testCourseAdv/slides/rebasePresentation.md index ef4e1f06..9c4da1c0 100644 --- a/2019/2019-09-09_testCourseAdv/slides/rebasePresentation.md +++ b/2019/2019-09-09_testCourseAdv/slides/rebasePresentation.md @@ -5,6 +5,6 @@ If we're on the develop branch, we can use git rebase master ``` -This will move the develop branch forward to match master's current state. +This will move the develop branch forward to match master's current state. **image showing master branch and branch A, branch A now being on the HEAD of master** \ No newline at end of file -- GitLab