From 82ac45d59d501310d8c3e14f5c7bededf99b15a1 Mon Sep 17 00:00:00 2001 From: Daniel Duarte Tojal <daniel.duarte.001@student.uni.lu> Date: Mon, 2 Sep 2019 12:35:55 +0200 Subject: [PATCH] Update format to conform to new theme --- 2019/2019-09-09_testCourseAdv/slides/chPickIntro.md | 2 +- .../slides/chPickPresentation1.md | 2 +- .../slides/chPickPresentation2.md | 2 +- .../slides/gettingStarted.md | 2 +- 2019/2019-09-09_testCourseAdv/slides/index.md | 12 ++++++------ 2019/2019-09-09_testCourseAdv/slides/mergeIntro.md | 2 +- 2019/2019-09-09_testCourseAdv/slides/overview.md | 2 +- .../2019-09-09_testCourseAdv/slides/rebase-iIntro.md | 2 +- .../slides/rebase-iPresentation1.md | 2 +- .../slides/rebase-iPresentation2.md | 2 +- .../slides/rebase-iPresentation3.md | 2 +- 2019/2019-09-09_testCourseAdv/slides/rebaseIntro.md | 2 +- 2019/2019-09-09_testCourseAdv/slides/rebaseIntro2.md | 2 +- .../slides/rebasePresentation1.md | 2 +- .../slides/rebasePresentation2.md | 2 +- 2019/2019-09-09_testCourseAdv/slides/thanks.md | 2 +- 16 files changed, 21 insertions(+), 21 deletions(-) diff --git a/2019/2019-09-09_testCourseAdv/slides/chPickIntro.md b/2019/2019-09-09_testCourseAdv/slides/chPickIntro.md index 92d5fac2..e304c118 100644 --- a/2019/2019-09-09_testCourseAdv/slides/chPickIntro.md +++ b/2019/2019-09-09_testCourseAdv/slides/chPickIntro.md @@ -1,4 +1,4 @@ -## Cherry-picking +# Cherry-picking * It enables the user to pick specific commits from a list of commits. diff --git a/2019/2019-09-09_testCourseAdv/slides/chPickPresentation1.md b/2019/2019-09-09_testCourseAdv/slides/chPickPresentation1.md index 2256a8ad..a386c9cb 100644 --- a/2019/2019-09-09_testCourseAdv/slides/chPickPresentation1.md +++ b/2019/2019-09-09_testCourseAdv/slides/chPickPresentation1.md @@ -1,4 +1,4 @@ -## Cherry Picking Workshop +# Cherry Picking Workshop * In your branch, create and commit a reference file ```bash diff --git a/2019/2019-09-09_testCourseAdv/slides/chPickPresentation2.md b/2019/2019-09-09_testCourseAdv/slides/chPickPresentation2.md index 9daa3dd3..24013cdf 100644 --- a/2019/2019-09-09_testCourseAdv/slides/chPickPresentation2.md +++ b/2019/2019-09-09_testCourseAdv/slides/chPickPresentation2.md @@ -1,4 +1,4 @@ -## Cherry Picking Workshop +# Cherry Picking Workshop * Check the commit reference of the two commits in develop * Chose the commit to keep and add it to your branch diff --git a/2019/2019-09-09_testCourseAdv/slides/gettingStarted.md b/2019/2019-09-09_testCourseAdv/slides/gettingStarted.md index 3f7ca1b7..cc8beb51 100644 --- a/2019/2019-09-09_testCourseAdv/slides/gettingStarted.md +++ b/2019/2019-09-09_testCourseAdv/slides/gettingStarted.md @@ -1,4 +1,4 @@ -## Getting Started +# Getting Started Fork and clone the tutorial repository ```bash diff --git a/2019/2019-09-09_testCourseAdv/slides/index.md b/2019/2019-09-09_testCourseAdv/slides/index.md index cd50ec68..8c0183b1 100644 --- a/2019/2019-09-09_testCourseAdv/slides/index.md +++ b/2019/2019-09-09_testCourseAdv/slides/index.md @@ -1,6 +1,6 @@ -## Advanced Git Training -<br><br> -#### August 21st, 2019 +# Advanced Git Training + +## August 21st, 2019 <div style="top: 6em; left: 0%; position: absolute;"> <img src="theme/img/lcsb_bg.png"> @@ -8,9 +8,9 @@ <div style="top: 5em; left: 60%; position: absolute;"> <img src="slides/img/r3-training-logo.png" height="200px"> - <br><br><br><br> - <h3>Git Advanced Tutorial</h3> - <br><br><br><br> + <br><br><br> + <h1>Git Advanced Tutorial</h1> + <br><br><br> <h4> Daniel Tojal, Title<br><br> daniel.duarte.001@student.uni.lu<br><br> diff --git a/2019/2019-09-09_testCourseAdv/slides/mergeIntro.md b/2019/2019-09-09_testCourseAdv/slides/mergeIntro.md index 51d80640..f0d7a3be 100644 --- a/2019/2019-09-09_testCourseAdv/slides/mergeIntro.md +++ b/2019/2019-09-09_testCourseAdv/slides/mergeIntro.md @@ -1,2 +1,2 @@ -## Merging +# Merging diff --git a/2019/2019-09-09_testCourseAdv/slides/overview.md b/2019/2019-09-09_testCourseAdv/slides/overview.md index f5725a3c..a9e8b355 100644 --- a/2019/2019-09-09_testCourseAdv/slides/overview.md +++ b/2019/2019-09-09_testCourseAdv/slides/overview.md @@ -1,4 +1,4 @@ -## Overview +# Overview 1. Rebasing in Git 2. Git cherry-picking \ No newline at end of file diff --git a/2019/2019-09-09_testCourseAdv/slides/rebase-iIntro.md b/2019/2019-09-09_testCourseAdv/slides/rebase-iIntro.md index fbbfc806..1dca386a 100644 --- a/2019/2019-09-09_testCourseAdv/slides/rebase-iIntro.md +++ b/2019/2019-09-09_testCourseAdv/slides/rebase-iIntro.md @@ -1,4 +1,4 @@ -## Interactive Rebasing +# Interactive Rebasing ```bash git rebase -i <branch> diff --git a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation1.md b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation1.md index 734f1636..10b84e9e 100644 --- a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation1.md +++ b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation1.md @@ -1,4 +1,4 @@ -## Interactive Rebase Workshop +# Interactive Rebase Workshop * Create and switch to your own branch * Add and commit two files to this branch: diff --git a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation2.md b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation2.md index 61409fb1..6e5b6dea 100644 --- a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation2.md +++ b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation2.md @@ -1,4 +1,4 @@ -## Interactive Rebase Workshop +# Interactive Rebase Workshop * Perform an interactive rebase with the two last commits: diff --git a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation3.md b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation3.md index 41c9f133..1ee1e7eb 100644 --- a/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation3.md +++ b/2019/2019-09-09_testCourseAdv/slides/rebase-iPresentation3.md @@ -1,4 +1,4 @@ -## Interactive Rebase Workshop +# Interactive Rebase Workshop The prompt shows up: diff --git a/2019/2019-09-09_testCourseAdv/slides/rebaseIntro.md b/2019/2019-09-09_testCourseAdv/slides/rebaseIntro.md index 092728fd..cb58d9b7 100644 --- a/2019/2019-09-09_testCourseAdv/slides/rebaseIntro.md +++ b/2019/2019-09-09_testCourseAdv/slides/rebaseIntro.md @@ -1,4 +1,4 @@ -## Rebasing +# Rebasing * Git rebase enables to keep up with changes made to a branch * Straightens the workflow diff --git a/2019/2019-09-09_testCourseAdv/slides/rebaseIntro2.md b/2019/2019-09-09_testCourseAdv/slides/rebaseIntro2.md index 1522b08f..9c68c5f5 100644 --- a/2019/2019-09-09_testCourseAdv/slides/rebaseIntro2.md +++ b/2019/2019-09-09_testCourseAdv/slides/rebaseIntro2.md @@ -1,4 +1,4 @@ -## Rebasing +# Rebasing * Develop branch is several commits ahead of master. * Commits implemented into master that aren't in develop. diff --git a/2019/2019-09-09_testCourseAdv/slides/rebasePresentation1.md b/2019/2019-09-09_testCourseAdv/slides/rebasePresentation1.md index 322b8e03..1062dbd4 100644 --- a/2019/2019-09-09_testCourseAdv/slides/rebasePresentation1.md +++ b/2019/2019-09-09_testCourseAdv/slides/rebasePresentation1.md @@ -1,4 +1,4 @@ -## Rebasing Workshop +# Rebasing Workshop * Create a file in your branch ```bash diff --git a/2019/2019-09-09_testCourseAdv/slides/rebasePresentation2.md b/2019/2019-09-09_testCourseAdv/slides/rebasePresentation2.md index 6bec8f30..0d00349e 100644 --- a/2019/2019-09-09_testCourseAdv/slides/rebasePresentation2.md +++ b/2019/2019-09-09_testCourseAdv/slides/rebasePresentation2.md @@ -1,4 +1,4 @@ -## Rebasing Workshop +# Rebasing Workshop * rebase the develop branch onto your branch ```bash diff --git a/2019/2019-09-09_testCourseAdv/slides/thanks.md b/2019/2019-09-09_testCourseAdv/slides/thanks.md index 7eb6d2f0..4867fa1e 100644 --- a/2019/2019-09-09_testCourseAdv/slides/thanks.md +++ b/2019/2019-09-09_testCourseAdv/slides/thanks.md @@ -1,4 +1,4 @@ -## Thank you. +# Thank you. <center><img src="slides/img/r3-training-logo.png" height="200px"></center> -- GitLab