Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Courses
Git
Advanced Git
Commits
fd35f2a8
Commit
fd35f2a8
authored
Mar 11, 2022
by
Ferdinando Carbone
Browse files
Correzioni marginali
parent
1ec19d4c
Pipeline
#1354
passed with stage
in 1 minute and 5 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
assets/one-simply-cherry-pick.jpg
View replaced file @
1ec19d4c
View file @
fd35f2a8
33 KB
|
W:
|
H:
55.5 KB
|
W:
|
H:
2-up
Swipe
Onion skin
assets/one-simply-cherry-pick1.jpg
0 → 100644
View file @
fd35f2a8
33 KB
assets/yo-dawg-submodule.jpg
View replaced file @
1ec19d4c
View file @
fd35f2a8
38.3 KB
|
W:
|
H:
71.6 KB
|
W:
|
H:
2-up
Swipe
Onion skin
assets/yo-dawg-submodule1.jpg
0 → 100644
View file @
fd35f2a8
38.3 KB
slides/content.md
View file @
fd35f2a8
...
...
@@ -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
**
.
----
##
a
mending commits
##
A
mending commits
---
...
...
slides/intro.html
View file @
fd35f2a8
...
...
@@ -5,7 +5,6 @@
<img
src=
"./poul/img/logo-text-white.svg"
/>
<p>
Mirko
<
mroik@poul.org
>
<br>
frigobar
<
frigobar@poul.org
>
<br>
Vechapw
<
vechapw@poul.org
>
</p>
<p><left>
Mirko
<
mroik@poul.org
>
</left>
<right>
frigobar
<
frigobar@poul.org
>
</right><br>
<center>
Vechapw
<
vechapw@poul.org
>
</center></p>
</section>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment