git revertとgit resetは何が違う？違いと使い方を実例で解説｜間違ったコミットの修正や消してしまったコミットの復活方法(初心者向け、わかりやすい)

#コミット履歴（A〜D）
A---B---C---D
          main


#コミットDの作業を打ち消す
$ git revert D

A---B---C---D---F
              main

#コミット履歴（A〜D）
A---B---C---D
          main


#コミットDの作業を打ち消す
$ git reset C

A---B---C
       main

git revert <打ち消したいコミット>

#コミット履歴（A〜D）
A---B---C---D
          master

#コミットBの作業を打ち消す
$ git revert B

A---B---C---D---D'
              master

$ git log --oneline
0701d9d (HEAD -> test, second/aa, origin/aa, aa) [U]docker-compose add webpack port 3035
a90d4ef [U]content-security-policy(CSP) enable webpack-dev-server
6adca49 [A]destroyメソッド & Modal追加

$ git revert 6adca49

Revert "[A]destroyメソッド & Modal追加"

This reverts commit 6adca498b4dbdc4df8c18fe15a713507b80222d6.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch test
# Your branch is up to date with 'origin/aa'.
#
# Changes to be committed:
#	modified:   app/controllers/api/pj1/clients_controller.rb
#	deleted:    app/javascript/components/Modal.vue
#	modified:   app/javascript/components/clients/Clients.vue
#	modified:   config/routes.rb
#

$ git revert 6adca49
Removing app/javascript/components/Modal.vue
[test f5351fe] Revertで"[A]destroyメソッド & Modal追加"を打ち消しました。
 4 files changed, 4 insertions(+), 154 deletions(-)
 delete mode 100644 app/javascript/components/Modal.vue

$ git log --oneline
f5351fe (HEAD -> test) Revertで"[A]destroyメソッド & Modal追加"を打ち消しました
。
0701d9d (second/aa, origin/aa, aa) [U]docker-compose add webpack port 3035
a90d4ef [U]content-security-policy(CSP) enable webpack-dev-server
6adca49 [A]destroyメソッド & Modal追加

$ git show f5351fe
commit f5351fe4e4634f66c15e1d819222659d05967348 (HEAD -> test)
Author: author <example@gmail.com>
Date:   Thu Jan 27 18:55:10 2022 +0900

    Revertで"[A]destroyメソッド & Modal追加"を打ち消しました。

    This reverts commit 6adca498b4dbdc4df8c18fe15a713507b80222d6.

diff --git a/app/controllers/api/pj1/clients_controller.rb b/app/controllers/api/pj1/clients_controller.rb
index 78ac0a1..9b60278 100644
--- a/app/controllers/api/pj1/clients_controller.rb
+++ b/app/controllers/api/pj1/clients_controller.rb
@@ -1,5 +1,5 @@
 class Api::Pj1::ClientsController < ApiController
-  before_action :set_client, only: [:show, :update, :destroy]
+  before_action :set_client, only: [:show, :update]

   #例外処理
   rescue_from Exception, with: :render_status_500

git revert --no-edit

$ git log --oneline
0701d9d (HEAD -> test, second/aa, origin/aa, aa) [U]docker-compose add webpack port 3035
a90d4ef [U]content-security-policy(CSP) enable webpack-dev-server
6adca49 [A]destroyメソッド & Modal追加

$ git revert 6adca49 --no-edit
Removing app/javascript/components/Modal.vue
[test 2d9d637] Revert "[A]destroyメソッド & Modal追加"
 Date: Thu Jan 27 19:05:07 2022 +0900
 4 files changed, 4 insertions(+), 154 deletions(-)
 delete mode 100644 app/javascript/components/Modal.vue

$ git log --oneline
2d9d637 (HEAD -> test) Revert "[A]destroyメソッド & Modal追加"
0701d9d (second/aa, origin/aa, aa) [U]docker-compose add webpack port 3035
a90d4ef [U]content-security-policy(CSP) enable webpack-dev-server
6adca49 [A]destroyメソッド & Modal追加

$ git show 2d9d637
commit 2d9d6370b4e8b805c12dc3b6d11b6bdf7b3e984b (HEAD -> test)
Author: author <example@gmail.com>
Date:   Thu Jan 27 18:55:10 2022 +0900

    Revertで"[A]destroyメソッド & Modal追加"を打ち消しました。

    This reverts commit 6adca498b4dbdc4df8c18fe15a713507b80222d6.

diff --git a/app/controllers/api/pj1/clients_controller.rb b/app/controllers/api/pj1/clients_controller.rb
index 78ac0a1..9b60278 100644
--- a/app/controllers/api/pj1/clients_controller.rb
+++ b/app/controllers/api/pj1/clients_controller.rb
@@ -1,5 +1,5 @@
 class Api::Pj1::ClientsController < ApiController
-  before_action :set_client, only: [:show, :update, :destroy]
+  before_action :set_client, only: [:show, :update]

   #例外処理
   rescue_from Exception, with: :render_status_500

$ git revert 6adca49
error: Your local changes to the following files would be overwritten by merge:
        app/controllers/api/pj1/clients_controller.rb
Please commit your changes or stash them before you merge.
Aborting
fatal: revert failed

$ git revert 6adca49
error: your local changes would be overwritten by revert.
hint: commit your changes or stash them to proceed.
fatal: revert failed

$ git revert @@{12} --no-edit
Auto-merging style.css
CONFLICT (content): Merge conflict in style.css
error: could not revert 9390048... add line3
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

#conflictが発生しているファイルを確認する
$ git st
On branch ft2
You are currently reverting commit 2767830.
  (fix conflicts and run "git revert --continue")
  (use "git revert --skip" to skip this patch)
  (use "git revert --abort" to cancel the revert operation)

Unmerged paths:
  (use "git restore --staged <file>..." to unstage)
  (use "git add <file>..." to mark resolution)
    both modified:   style.css

#vimエディタで修正する
vi style.css


#add & commit
git add <対象ファイル> && git commit -m "メッセージ"

git revert -m <パターン番号> <マージコミット>

#コミット履歴(Hがマージコミット)

      A---B---C 
     /         \
D---E---F---G---H 
              master

$git revert -m 1 H

      A---B---C 
     /         \
D---E---F---G---H---H'
                  master

$ git merge topic
Already up-to-date.

git reset <コミット>

git reset <コミット> <ファイルパス>

$ git reset @^^^  app/controllers/api/pj1/clients_controller.rb
Unstaged changes after reset:
M       app/controllers/api/pj1/clients_controller.rb

git reset --soft <コミット>

git reset --soft <コミット> <ファイルパス>

$ git status
On branch test
Your branch is ahead of 'origin/aa' by 1 commit.
  (use "git push" to publish your local commits)

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        modified:   docker-compose.yml

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   app/controllers/api/pj1/clients_controller.rb

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        app/views/layouts/test.html.erb

$ git log --oneline
c9c53c7 (HEAD -> test) comment out
0701d9d (second/aa, origin/aa, aa) [U]docker-compose add webpack port 3035
a90d4ef [U]content-security-policy(CSP) enable webpack-dev-server
6adca49 [A]destroyメソッド & Modal追加
61d3b4b [A]ClientEdit.vue
00093d1 [F]ClientNewからClientForm.vueを切り出し

$ git reset --soft @^^^

$ git log --oneline
6adca49 (HEAD -> test) [A]destroyメソッド & Modal追加
61d3b4b [A]ClientEdit.vue
00093d1 [F]ClientNewからClientForm.vueを切り出し

$ git st
On branch test
Your branch is behind 'origin/aa' by 2 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        modified:   app/controllers/api/pj1/clients_controller.rb
        modified:   config/initializers/content_security_policy.rb
        modified:   docker-compose.yml

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   app/controllers/api/pj1/clients_controller.rb

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        app/views/layouts/test.html.erb

git reset --hard <コミット>

git reset --hard <コミット> <ファイルパス>

$ git status
On branch test
Your branch is ahead of 'origin/aa' by 1 commit.
  (use "git push" to publish your local commits)

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        modified:   docker-compose.yml

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   app/controllers/api/pj1/clients_controller.rb

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        app/views/layouts/test.html.erb

$ git log --oneline
c9c53c7 (HEAD -> test) comment out
0701d9d (second/aa, origin/aa, aa) [U]docker-compose add webpack port 3035
a90d4ef [U]content-security-policy(CSP) enable webpack-dev-server
6adca49 [A]destroyメソッド & Modal追加
61d3b4b [A]ClientEdit.vue
00093d1 [F]ClientNewからClientForm.vueを切り出し

$ git reset --hard @^^^
HEAD is now at 6adca49 [A]destroyメソッド & Modal追加

$ git log --oneline
6adca49 (HEAD -> test) [A]destroyメソッド & Modal追加
61d3b4b [A]ClientEdit.vue
00093d1 [F]ClientNewからClientForm.vueを切り出し

$ git status
On branch test
Your branch is behind 'origin/aa' by 2 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        app/views/layouts/test.html.erb

nothing added to commit but untracked files present (use "git add" to track)

git reset <コミット>

git reset <コミット> <ファイルパス>

$ git status
On branch test
Your branch is ahead of 'origin/aa' by 1 commit.
  (use "git push" to publish your local commits)

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        modified:   docker-compose.yml

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   app/controllers/api/pj1/clients_controller.rb

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        app/views/layouts/test.html.erb

$ git log --oneline
c9c53c7 (HEAD -> test) comment out
0701d9d (second/aa, origin/aa, aa) [U]docker-compose add webpack port 3035
a90d4ef [U]content-security-policy(CSP) enable webpack-dev-server
6adca49 [A]destroyメソッド & Modal追加
61d3b4b [A]ClientEdit.vue
00093d1 [F]ClientNewからClientForm.vueを切り出し

$ git reset @^^^
Unstaged changes after reset:
M       config/initializers/content_security_policy.rb

$ git log --oneline
6adca49 (HEAD -> test) [A]destroyメソッド & Modal追加
61d3b4b [A]ClientEdit.vue
00093d1 [F]ClientNewからClientForm.vueを切り出し

$ git status
On branch test
Your branch is behind 'origin/aa' by 2 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   config/initializers/content_security_policy.rb

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        app/views/layouts/test.html.erb

no changes added to commit (use "git add" and/or "git commit -a")

#コマンド履歴の一覧を確認
$ git reflog

#コミットを戻す
$ git reset <コマンド履歴を指定>

129ba79 (image_tag) HEAD@{4}: checkout: moving from fix to image_tag
129ba79 (image_tag) HEAD@{5}: commit: [A]home.index ホバーの画像切り替え

$ git log --oneline
c9c53c7 (HEAD -> test) comment out
0701d9d (second/aa, origin/aa, aa) [U]docker-compose add webpack port 3035
a90d4ef [U]content-security-policy(CSP) enable webpack-dev-server
6adca49 [A]destroyメソッド & Modal追加
61d3b4b [A]ClientEdit.vue
00093d1 [F]ClientNewからClientForm.vueを切り出し

$ git status
On branch test
Your branch is ahead of 'origin/aa' by 1 commit.
  (use "git push" to publish your local commits)

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   app/controllers/api/pj1/clients_controller.rb

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        app/views/layouts/test.html.erb

no changes added to commit (use "git add" and/or "git commit -a")

$ git log --oneline
6adca49 (HEAD -> test) [A]destroyメソッド & Modal追加
61d3b4b [A]ClientEdit.vue
00093d1 [F]ClientNewからClientForm.vueを切り出し

$ git status
On branch test
Your branch is behind 'origin/aa' by 2 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)

Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        modified:   app/controllers/api/pj1/clients_controller.rb
        modified:   config/initializers/content_security_policy.rb
        modified:   docker-compose.yml

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        app/views/layouts/test.html.erb

$ git reflog
6adca49 (HEAD -> test) HEAD@{0}: reset: moving to @^^^
c9c53c7 HEAD@{1}: reset: moving to @^
9e8f510 HEAD@{2}: revert: Revert "[A]destroyメソッド & Modal追加"
c9c53c7 HEAD@{3}: reset: moving to @^
6b26abb HEAD@{4}: revert: Revert "[A]destroyメソッド & Modal追加"
c9c53c7 HEAD@{5}: commit: comment out
0701d9d (second/aa, origin/aa, aa) HEAD@{6}: reset: moving to @^
2d9d637 HEAD@{7}: revert: Revert "[A]destroyメソッド & Modal追加"
0701d9d (second/aa, origin/aa, aa) HEAD@{10}: rebase (finish): returning to refs/heads/test

$ git reset HEAD@{1}
Unstaged changes after reset:
M       app/controllers/api/pj1/clients_controller.rb

$ git log --oneline
c9c53c7 (HEAD -> test) comment out
0701d9d (second/aa, origin/aa, aa) [U]docker-compose add webpack port 3035
a90d4ef [U]content-security-policy(CSP) enable webpack-dev-server
6adca49 [A]destroyメソッド & Modal追加
61d3b4b [A]ClientEdit.vue
00093d1 [F]ClientNewからClientForm.vueを切り出し

$ git status
On branch test
Your branch is ahead of 'origin/aa' by 1 commit.
  (use "git push" to publish your local commits)

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   app/controllers/api/pj1/clients_controller.rb

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        app/views/layouts/test.html.erb

no changes added to commit (use "git add" and/or "git commit -a")