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

Rename and adjust presentation slides

parent 643fdd96
No related branches found
No related tags found
No related merge requests found
......@@ -30,22 +30,17 @@
}
},
{
"filename": "rebase-iPresentation2.md",
"attr": {
}
},
{
"filename": "rebase-iPresentation4.md",
"filename": "rebase-iPresentation1.md",
"attr": {
}
},
{
"filename": "rebase-iPresentation5.md",
"filename": "rebase-iPresentation2.md",
"attr": {
}
},
{
"filename": "rebase-iPresentation6.md",
"filename": "rebase-iPresentation3.md",
"attr": {
}
},
......
## Interactive Rebase Workshop
* Create and switch to your own branch
* Add and commit two files to this branch:
```bash
$ echo "Name of one attendee" > attendeeName.md
git add attendeeName.md
git commit -m "Add name to the list of attendees"
git push origin yourBranch
$ echo "Name of a second attendee" > attendeeName2.md
git add attendeeName2.md
git commit -m "Add name to the list of attendees"
git push origin yourBranch
```
\ No newline at end of file
## Interactive Rebase Workshop
* Create and switch to your own branch
* Add and commit two files to this branch:
* Perform an interactive rebase onto the develop branch
```bash
$ echo "Name of one attendee" > attendeeName.md
git add attendeeName.md
git commit -m "Add name to the list of attendees"
git push origin yourBranch
git rebase -i develop
```
$ echo "Name of a second attendee" > attendeeName2.md
git add attendeeName2.md
git commit -m "Add name to the list of attendees"
git push origin yourBranch
```
\ No newline at end of file
* reword the first commit's message to:
`These are the two squashed commits`
* combine the second and first commit into one,
omitting the second's commit message.
\ No newline at end of file
## Interactive Rebase Workshop
* Perform an interactive rebase onto the develop branch
```bash
git rebase -i develop
```
* reword the first commit's message to:
`These are the two squashed commits`
* combine the second and first commit into one,
omitting the second's commit message.
\ No newline at end of file
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