From c12034d6eb1a4d03e4d2ded939a73487894899f1 Mon Sep 17 00:00:00 2001 From: Neal Magee Date: Tue, 6 Aug 2024 09:53:22 -0400 Subject: [PATCH] Reorder them --- docs/git-advanced.md | 8 ++++---- docs/github-actions.md | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/git-advanced.md b/docs/git-advanced.md index 8dc9217..69aa0e6 100644 --- a/docs/git-advanced.md +++ b/docs/git-advanced.md @@ -1,7 +1,7 @@ --- layout: default -title: 5 - Advanced Git -nav_order: 7 +title: 6 - Advanced Git +nav_order: 8 --- # Advanced `git` @@ -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. - + 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. @@ -181,7 +181,7 @@ destination git@github.com: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. - + Topics include: diff --git a/docs/github-actions.md b/docs/github-actions.md index 23b3e76..6951d6a 100644 --- a/docs/github-actions.md +++ b/docs/github-actions.md @@ -1,7 +1,7 @@ --- layout: default -title: 6 - GitHub Actions -nav_order: 8 +title: 5 - GitHub Actions +nav_order: 7 --- # GitHub Actions