woose/Introduction_to_Git_and_GitHub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update module2.ipynb

Browse Source
This commit is contained in:
Yavuz Sava 2025-03-06 13:13:07 +03:00
parent 1bd53ad044
commit 4ae82a400b
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
module2.ipynb
View File

@ -1137,8 +1137,36 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"# \n",
"\n"
"# Study guide: Git Revert\n",
"\n",
"When writing and committing code, making mistakes is a common occurrence. Thankfully, there are multiple ways for you to revert or undo your mistakes. Take a look at the helpful commands below.\n",
"\n",
"[git checkout<svg aria-labelledby=\"cds-react-aria2659598955-:r1gc:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria2659598955-:r1gc:\"><title id=\"cds-react-aria2659598955-:r1gc:-title\">Opens in a new tab</title></svg>](https://git-scm.com/docs/git-checkout) is used to switch branches. For example, you might want to pull from your main branch. In this case, you would use the command git checkout main. This will switch to your main branch, allowing you to pull. Then you could switch to another branch by using the command  git checkout <branch>.\n",
"\n",
"[git reset<svg aria-labelledby=\"cds-react-aria2659598955-:r1ge:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria2659598955-:r1ge:\"><title id=\"cds-react-aria2659598955-:r1ge:-title\">Opens in a new tab</title></svg>](https://git-scm.com/docs/git-reset#_examples)  can be somewhat difficult to understand. Say you have just used the command git add. to stage all of your changes, but then you decide that you are not ready to stage those files. You could use the command git reset to undo the staging of your files.\n",
"\n",
"There are some other useful articles online, which discuss more aggressive approaches to [resetting the repo<svg aria-labelledby=\"cds-react-aria2659598955-:r1gg:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria2659598955-:r1gg:\"><title id=\"cds-react-aria2659598955-:r1gg:-title\">Opens in a new tab</title></svg>](https://jwiegley.github.io/git-from-the-bottom-up/3-Reset/4-doing-a-hard-reset.html) (Git repository). As discussed in this article, doing a hard reset can be extremely dangerous. With a hard reset, you run the risk of losing your local changes. There are safer ways to achieve the same effect. For example, you could run git stash, which will temporarily shelve or stash your current changes. This way, your current changes are kept safe, and you can come back to them if needed.\n",
"\n",
"[git commit --amend<svg aria-labelledby=\"cds-react-aria2659598955-:r1gi:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria2659598955-:r1gi:\"><title id=\"cds-react-aria2659598955-:r1gi:-title\">Opens in a new tab</title></svg>](https://git-scm.com/docs/git-commit#Documentation/git-commit.txt---amend) is used to make changes to your most recent commit after-the-fact, which can be useful for making notes about or adding files to your most recent commit. Be aware that this git --amend command rewrites and replaces your previous commit, so it is best not to use this command on a published commit.\n",
"\n",
"[git revert<svg aria-labelledby=\"cds-react-aria2659598955-:r1gk:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria2659598955-:r1gk:\"><title id=\"cds-react-aria2659598955-:r1gk:-title\">Opens in a new tab</title></svg>](https://git-scm.com/docs/git-revert) makes a new commit which effectively rolls back a previous commit. Unlike the git reset command which rewrites your commit history, the git revert command creates a new commit which undoes the changes in a specific commit. Therefore, a revert command is generally safer than a reset command.\n",
"\n",
"For more information on these and other methods to undo something in Git, checkout this [Git Basics - Undoing Things<svg aria-labelledby=\"cds-react-aria2659598955-:r1gm:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria2659598955-:r1gm:\"><title id=\"cds-react-aria2659598955-:r1gm:-title\">Opens in a new tab</title></svg>](https://git-scm.com/book/en/v2/Git-Basics-Undoing-Things) article.\n",
"\n",
"Additionally, there are some interesting considerations about how git object data is stored, such as the usage of SHA-1.\n",
"\n",
"SHA-1 is what’s known as a *hash function*, a cryptographic function that generates a digital fingerprint of a file. Theoretically, it’s impossible for two different files to have the same SHA-1 hash, which means that SHA-1 can be used for two things:\n",
"\n",
"- Confirming that the contents of a file have not changed (digital signature).\n",
"- Serving as an identifier for the file itself (a token or fingerprint).\n",
"\n",
"Git calculates a hash for every commit. Those hashes are displayed by commands like git log or in various pages on Github. For commands like git revert, you can then use the hash to refer to a specific commit.\n",
"\n",
"Feel free to read more here:\n",
"\n",
"- [SHA-1 collision detection on GitHub.com<svg aria-labelledby=\"cds-react-aria2659598955-:r1go:-title\" fill=\"none\" focusable=\"false\" height=\"16\" role=\"img\" viewBox=\"0 0 20 20\" width=\"16\" class=\"css-8blerm\" id=\"cds-react-aria2659598955-:r1go:\"><title id=\"cds-react-aria2659598955-:r1go:-title\">Opens in a new tab</title></svg>](https://github.blog/2017-03-20-sha-1-collision-detection-on-github-com/)\n",
"\n",
"Even the most accomplished developers make mistakes in Git. It happens to everyone, so don’t stress about it. You have these and other methods to help you revert or undo your mistakes."
]
}
],