Skip to content

Commit

Permalink
Reorder them
Browse files Browse the repository at this point in the history
  • Loading branch information
nmagee committed Aug 6, 2024
1 parent 3896dcb commit c12034d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions docs/git-advanced.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
layout: default
title: 5 - Advanced Git
nav_order: 7
title: 6 - Advanced Git
nav_order: 8
---

# Advanced `git`
Expand Down Expand Up @@ -118,7 +118,7 @@ Cherry picking is choosing a commit from one branch and applying it to another.

Take the example below. A developer has been working on the `main` branch, while a second developer began a new `nav` branch. The second developer fixed a bug in the `main` branch before moving on to other work, and the first developer would like to apply ONLY that bug fix to the `main` branch.

<img style="width:600px;align:left;" src="./images/git-cherry-pick.png">
<img style="width:600px;align:left;" src="../images/git-cherry-pick.png">

This is an ideal case for using `git cherry-pick`. When cherry picking you use the hash of any individual commit, available from `git log` in the branch you want to pick from.

Expand Down Expand Up @@ -181,7 +181,7 @@ destination [email protected]:mst3k/some-repo.git (push)

In this video Scott Chacon, one of the co-founders and original developers of GitHub, talks about buried and advanced features in Git and GitHub.

<a href="https://www.youtube.com/watch?v=aolI_Rz0ZqY" target="_new"><img style="width:600px;align:left;" src="./images/scott-chacon-git-talk.png"></a>
<a href="https://www.youtube.com/watch?v=aolI_Rz0ZqY" target="_new"><img style="width:600px;align:left;" src="../images/scott-chacon-git-talk.png"></a>

Topics include:

Expand Down
4 changes: 2 additions & 2 deletions docs/github-actions.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
layout: default
title: 6 - GitHub Actions
nav_order: 8
title: 5 - GitHub Actions
nav_order: 7
---

# GitHub Actions
Expand Down

0 comments on commit c12034d

Please sign in to comment.