Git Herstel

Verander platform:

Git Herstel

resetis die opdrag wat ons gebruik wanneer ons die bewaarplek wil terugskuif na 'n vorige commit, wat enige veranderinge wat daarna gemaak is, weggooi commit.

Stap 1: Vind die vorige commit:

Git Herstel Stap 1

Stap 2: Skuif die bewaarplek terug na daardie stap:

Git Reset Stap 2

Na die vorige hoofstuk het ons 'n deel in ons commitgeskiedenis waarna ons kan teruggaan. Kom ons probeer dit met reset.

Git Herstel Vind Commit in Log

Eerste ding, ons moet die punt vind waarna ons wil terugkeer. Om dit te doen, moet ons deur die log.

Om die baie lang loglys te vermy, gaan ons die --onelineopsie gebruik, wat net een reël per commitvertoning gee:

Die eerste sewe karakters van die commit hash- dit is waarna ons moet verwys in ons reset-opdrag.
diecommit message

So kom ons vind die punt waarna ons wil reset:

Voorbeeld

git log --oneline
e56ba1f (HEAD -> master) Revert "Just a regular update, definitely no accidents here..."
52418f7 Just a regular update, definitely no accidents here...
9a9add8 (origin/master) Added .gitignore
81912ba Corrected spelling error
3fdaa5b Merge pull request #1 from w3schools-test/update-readme
836e5bf (origin/update-readme, update-readme) Updated readme for GitHub Branches
daf4f7c (origin/html-skeleton, html-skeleton) Updated index.html with basic meta
facaeae (gh-page/master) Merge branch 'master' of https://github.com/w3schools-test/hello-world
e7de78f Updated index.html. Resized image
5a04b6f Updated README.md with a line about focus
d29d69f Updated README.md with a line about GitHub
e0b6038 merged with hello-world-images after fixing conflicts
1f1584e added new image
dfa79db updated index.html with emergency fix
0312c55 Added image to Hello World
09f4acd Updated index.html with a new line
221ec6e First release of Hello World!

Ons wil terugkeer na die commit: 9a9add8 (origin/master) Added .gitignore, die laaste een voor ons met dinge begin mors het.

Git Herstel

We reset our repository back to the specific commit using git reset commithash (commithash being the first 7 characters of the commit hash we found in the log):

Example

git reset 9a9add8

Now let's check the log again:

Example

git log --oneline
9a9add8 (HEAD -> master, origin/master) Added .gitignore
81912ba Corrected spelling error
3fdaa5b Merge pull request #1 from w3schools-test/update-readme
836e5bf (origin/update-readme, update-readme) Updated readme for GitHub Branches
daf4f7c (origin/html-skeleton, html-skeleton) Updated index.html with basic meta
facaeae (gh-page/master) Merge branch 'master' of https://github.com/w3schools-test/hello-world
e7de78f Updated index.html. Resized image
5a04b6f Updated README.md with a line about focus
d29d69f Updated README.md with a line about GitHub
e0b6038 merged with hello-world-images after fixing conflicts
1f1584e added new image
dfa79db updated index.html with emergency fix
0312c55 Added image to Hello World
09f4acd Updated index.html with a new line
221ec6e First release of Hello World!

Warning: Messing with the commit history of a repository can be dangerous. It is usually ok to make these kinds of changes to your own local repository. However, you should avoid making changes that rewrite history to remote repositories, especially if others are working with them.

Git Undo Reset

Even though the commits are no longer showing up in the log, it is not removed from Git.

If you know the commit hash you can reset to it:

Example

git reset e56ba1f

Now let's check the log again:

Example

git log --oneline
e56ba1f (HEAD -> master) Revert "Just a regular update, definitely no accidents here..."
52418f7 Just a regular update, definitely no accidents here...
9a9add8 (origin/master) Added .gitignore
81912ba Corrected spelling error
3fdaa5b Merge pull request #1 from w3schools-test/update-readme
836e5bf (origin/update-readme, update-readme) Updated readme for GitHub Branches
daf4f7c (origin/html-skeleton, html-skeleton) Updated index.html with basic meta
facaeae (gh-page/master) Merge branch 'master' of https://github.com/w3schools-test/hello-world
e7de78f Updated index.html. Resized image
5a04b6f Updated README.md with a line about focus
d29d69f Updated README.md with a line about GitHub
e0b6038 merged with hello-world-images after fixing conflicts
1f1584e added new image
dfa79db updated index.html with emergency fix
0312c55 Added image to Hello World
09f4acd Updated index.html with a new line
221ec6e First release of Hello World!

Git Tutoriaal

Git en {{title}}

Git Dra by

Git Gevorderd

Git Undo

Git Herstel

Verander platform:

Git Herstel

Git Herstel Vind Commit in Log

Voorbeeld

Git Herstel

Example

Example

Git Undo Reset

Example

Example

Test Yourself With Exercises

Exercise: