Commit fd35f2a8 authored by Ferdinando Carbone's avatar Ferdinando Carbone
Browse files

Correzioni marginali

parent 1ec19d4c
Pipeline #1354 passed with stage
in 1 minute and 5 seconds
assets/one-simply-cherry-pick.jpg

33 KB | W: | H:

assets/one-simply-cherry-pick.jpg

55.5 KB | W: | H:

assets/one-simply-cherry-pick.jpg
assets/one-simply-cherry-pick.jpg
assets/one-simply-cherry-pick.jpg
assets/one-simply-cherry-pick.jpg
  • 2-up
  • Swipe
  • Onion skin
assets/yo-dawg-submodule.jpg

38.3 KB | W: | H:

assets/yo-dawg-submodule.jpg

71.6 KB | W: | H:

assets/yo-dawg-submodule.jpg
assets/yo-dawg-submodule.jpg
assets/yo-dawg-submodule.jpg
assets/yo-dawg-submodule.jpg
  • 2-up
  • Swipe
  • Onion skin
......@@ -2,9 +2,9 @@
### What we'll talk about:
* Using git repos in a git repo: **submodule**
* Storing changes for later use: **stash**
* Moving a branch 'ahead': **rebase**
* Extracting commits from other branches: **cherry-pick**
* Storing changes for later use: **stash**
* Finding out who made a mistake: **blame**
----
......@@ -36,13 +36,13 @@ Every edit we make inside our submodule will not be pushed upstream. <!-- .eleme
#### Add submodule
```bash
git submodule add [-b branch_name] repository submodule_directory
git submodule add [-b branch_name] repository [submodule_directory]
```
#### Pull the files inside a submodule
```bash
git submodule update --init --recursive submodule_directory
git submodule update --init --recursive [submodule_directory]
```
----
......@@ -160,7 +160,7 @@ I need it when I want to import a **single** commit or **a range** of commits fr
<div>
<!-- .element: class="fragment" -->
Using **cherry pick**, git will perform a "rebase" (we will see later).
Using **cherry pick**, git will perform a **rebase**.
</div>
<div>
......@@ -254,11 +254,11 @@ Flag a good commit with **git bisect good** and a bad one with **git bisect bad*
All the commands in this presentation modify the git
history in one way or another, this can lead to
problems on shared projects and/or data loss.
problems on shared projects and/or **data loss**.
----
## amending commits
## Amending commits
---
......
......@@ -5,7 +5,6 @@
<img src="./poul/img/logo-text-white.svg"/>
<p>Mirko &lt;mroik@poul.org&gt;<br>
frigobar &lt;frigobar@poul.org&gt;<br>
Vechapw &lt;vechapw@poul.org&gt;</p>
<p><left>Mirko &lt;mroik@poul.org&gt;</left>&nbsp;&nbsp; <right>frigobar &lt;frigobar@poul.org&gt;</right><br>
<center>Vechapw &lt;vechapw@poul.org&gt;</center></p>
</section>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment