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
aae0fb3e
Commit
aae0fb3e
authored
Mar 23, 2021
by
Davide Depau
Browse files
Merge branch 'Depau-master-patch-51770' into 'master'
Minor spelling corrections See merge request corsi/Git/git-advanced!1
parents
c9f3ebaa
ae6ccdd0
Pipeline
#720
passed with stage
in 1 minute and 37 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
slides/content.md
View file @
aae0fb3e
...
...
@@ -35,7 +35,7 @@ Cloning a repository that contains a submodule will not clone it. <!-- .element:
Once created the sumodule will point always to the same commit.
<!-- .element: class="fragment" -->
Every edit
s
we
could
make inside our submodule will not be pushed upstream.
<!-- .element: class="fragment" -->
Every edit we make inside our submodule will not be pushed upstream.
<!-- .element: class="fragment" -->
---
...
...
@@ -83,7 +83,7 @@ Using **cherry pick**, git will perform a "rebase" (we will see later).
<div>
<!-- .element: class="fragment" -->
**N.B.**
We still need to resolve
ever
y conflicts (if needed).
**N.B.**
We still need to resolve
an
y conflicts (if needed).
</div>
---
...
...
@@ -317,7 +317,7 @@ Possible operations:
---
Sometimes we mess up the commit history and want to go back to a "safe" state
Sometimes we mess up the commit history and
we
want to go back to a "safe" state
Git stores special branches that point to the remote's branches
...
...
@@ -339,11 +339,11 @@ git checkout -B master
----
## Reflog
### How to find lost commit
sha
s
### How to find lost commit
SHA
s
---
Git stores the commit
sha
changes in a log
Git stores the commit
SHA
changes in a log
This can be accessed with:
```
bash
...
...
@@ -352,7 +352,7 @@ git reflog
---
In the reflog there are references to all the commits
made
, even
In the reflog there are references to all the
existing
commits, even
the ones that are unreachable and the intermediate commits of a rebase
----
...
...
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