Gitリセット
Gitリセット
reset
は、リポジトリを前に戻し、commit
その後に行われた変更を破棄するときに使用するコマンドですcommit
。
ステップ1:前のものを見つけるcommit
:
ステップ2:リポジトリをそのステップに戻します。
前の章の後で、私達は私達commit
が戻ることができる私達の歴史の一部を持っています。でやってみましょうreset
。
Gitリセットログでコミットを検索
まず、戻りたいポイントを見つける必要があります。そのためには、を通過する必要があり
log
ます。
log
非常に長いリスト
を避けるために、このオプションを使用し--oneline
ます。このオプションでは、表示ごとに1行だけがcommit
表示されます。
- -の最初の7文字は、
commit hash
resetコマンドで参照する必要があるものです。 - the
commit message
それでは、私たちがやりたいポイントを見つけましょうreset
:
例
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!
物事をいじり始める前の最後のcommit
:
に戻りたいと思います。9a9add8 (origin/master) Added .gitignore
Gitリセット
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!