diff --git a/2019/2019-09-09_testCourseAdv/slides/chPickIntro.md b/2019/2019-09-09_testCourseAdv/slides/chPickIntro.md index 92d5fac20775537cdf7360f153d16faf06639a8b..e304c1183e8d23369c0b2440156628fa8c5ae64c 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 2256a8ad4ac453ab391e15411aee8dc1f3234a18..a386c9cb9fc11368661fdb8953bd66723fb8de23 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 9daa3dd385921bb43f9954c88a3475eb7d9f36cb..24013cdf692e9e63c0ce07556edfa61560ee148d 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 3f7ca1b758a72f0b29bd5efbbe3f2908ca432a11..cc8beb518492ed6625192d0141ce3602d8f0ac13 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 cd50ec687ef64c611d19b11d5b3ea02b20819270..8c0183b1210dd5d20617786f94b84116de5111cf 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 51d80640906248f3195a75ea341d69812cee99a0..f0d7a3bef02fdf8d4e462ffa2c4ab2a872eaeea3 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 f5725a3c50c4518df8bc3d72c6291202b7a8166e..a9e8b35594740f05e5e0ea36ccc40791b264722b 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 fbbfc806044742b9d066d275e5c9617141d66f54..1dca386aa16fc67e139e357428ebfc65a17b0118 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 734f163634d03d8591e6bce0fcac5ff026242217..10b84e9e327e37784d41ba714031ec9870a1472e 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 61409fb1f93b0e5ef99899c44f627a1023cfe098..6e5b6dea30cdd8630fee945a1ec7d010f07d0392 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 41c9f1331c869b79dd1fab5f05e4fee866ed8efb..1ee1e7eba1214970cbceefacbe077528bb5ad3e0 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 092728fd90fb516e5edfa78679dc0ce50824d96f..cb58d9b7833096b3ea28d9c642bfbd2f5ae76eaf 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 1522b08f2fcc63db95784f0c623d23c7eb04e89d..9c68c5f5f77d5f3cd0c3875d4a251da12c3cd0a0 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 322b8e03f968380bcac93b0deb10c68d82b306fc..1062dbd4eb20fb8068eb91092ad78bdfc65ea82a 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 6bec8f30a7add35bdf966305f887ef54d5f66f3c..0d00349e88911145b5f6c095bb1a545212373e27 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 7eb6d2f0d5e552dbc0f5c00221417a907a5682cf..4867fa1e3edb10b52ef2a71e453296cffe21bab9 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>