Skip to content
Snippets Groups Projects
Commit 82ac45d5 authored by Daniel Duarte's avatar Daniel Duarte
Browse files

Update format to conform to new theme

parent 812ee987
No related branches found
No related tags found
No related merge requests found
Showing
with 21 additions and 21 deletions
## Cherry-picking # Cherry-picking
* It enables the user to pick specific commits from a list of commits. * It enables the user to pick specific commits from a list of commits.
......
## Cherry Picking Workshop # Cherry Picking Workshop
* In your branch, create and commit a reference file * In your branch, create and commit a reference file
```bash ```bash
......
## Cherry Picking Workshop # Cherry Picking Workshop
* Check the commit reference of the two commits in develop * Check the commit reference of the two commits in develop
* Chose the commit to keep and add it to your branch * Chose the commit to keep and add it to your branch
......
## Getting Started # Getting Started
Fork and clone the tutorial repository Fork and clone the tutorial repository
```bash ```bash
......
## Advanced Git Training # Advanced Git Training
<br><br>
#### August 21st, 2019 ## August 21st, 2019
<div style="top: 6em; left: 0%; position: absolute;"> <div style="top: 6em; left: 0%; position: absolute;">
<img src="theme/img/lcsb_bg.png"> <img src="theme/img/lcsb_bg.png">
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
<div style="top: 5em; left: 60%; position: absolute;"> <div style="top: 5em; left: 60%; position: absolute;">
<img src="slides/img/r3-training-logo.png" height="200px"> <img src="slides/img/r3-training-logo.png" height="200px">
<br><br><br><br> <br><br><br>
<h3>Git Advanced Tutorial</h3> <h1>Git Advanced Tutorial</h1>
<br><br><br><br> <br><br><br>
<h4> <h4>
Daniel Tojal, Title<br><br> Daniel Tojal, Title<br><br>
daniel.duarte.001@student.uni.lu<br><br> daniel.duarte.001@student.uni.lu<br><br>
......
## Merging # Merging
## Overview # Overview
1. Rebasing in Git 1. Rebasing in Git
2. Git cherry-picking 2. Git cherry-picking
\ No newline at end of file
## Interactive Rebasing # Interactive Rebasing
```bash ```bash
git rebase -i <branch> git rebase -i <branch>
......
## Interactive Rebase Workshop # Interactive Rebase Workshop
* Create and switch to your own branch * Create and switch to your own branch
* Add and commit two files to this branch: * Add and commit two files to this branch:
......
## Interactive Rebase Workshop # Interactive Rebase Workshop
* Perform an interactive rebase with the two last commits: * Perform an interactive rebase with the two last commits:
......
## Interactive Rebase Workshop # Interactive Rebase Workshop
The prompt shows up: The prompt shows up:
......
## Rebasing # Rebasing
* Git rebase enables to keep up with changes made to a branch * Git rebase enables to keep up with changes made to a branch
* Straightens the workflow * Straightens the workflow
......
## Rebasing # 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. * Commits implemented into master that aren't in develop.
......
## Rebasing Workshop # Rebasing Workshop
* Create a file in your branch * Create a file in your branch
```bash ```bash
......
## Rebasing Workshop # Rebasing Workshop
* rebase the develop branch onto your branch * rebase the develop branch onto your branch
```bash ```bash
......
## Thank you. # Thank you.
<center><img src="slides/img/r3-training-logo.png" height="200px"></center> <center><img src="slides/img/r3-training-logo.png" height="200px"></center>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment