-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
6 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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` | ||
|
@@ -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. | ||
|
||
|
@@ -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: | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters