Gerenciamento de Commits

Git Log

$ git log
commit cd24fc0e9eedbc4b9c835e7917aa2150ee134112 (HEAD -> main)
Author: Marcelo de Paiva Barbieri <[e-mail]>
Date:   Wed Jul 31 17:04:46 2024 -0300

    Alterando o arquivo.txt

commit 730efa2e12306dc7cefd961fb900185225d2cc54
Author: Marcelo de Paiva Barbieri <[e-mail]>
Date:   Wed Jul 31 16:56:08 2024 -0300

    Adicionando arquivo *.txt:

Git Log Path

$ git log -p arquivo.txt
commit cd24fc0e9eedbc4b9c835e7917aa2150ee134112 (HEAD -> main)
Author: Marcelo de Paiva Barbieri <[e-mail]>
Date:   Wed Jul 31 17:04:46 2024 -0300

    Alterando o arquivo.txt

diff --git a/arquivo.txt b/arquivo.txt
index e69de29..9f410cf 100644
--- a/arquivo.txt
+++ b/arquivo.txt
@@ -0,0 +1 @@
+Teste

commit 730efa2e12306dc7cefd961fb900185225d2cc54
Author: Marcelo de Paiva Barbieri <[e-mail]>
Date:   Wed Jul 31 16:56:08 2024 -0300

    Adicionando arquivo *.txt:

diff --git a/arquivo.txt b/arquivo.txt
new file mode 100644
index 0000000..e69de29

Checkout Commit

$ git log
commit cd24fc0e9eedbc4b9c835e7917aa2150ee134112 (HEAD -> main)
Author: Marcelo de Paiva Barbieri <[e-mail]>
Date:   Wed Jul 31 17:04:46 2024 -0300

    Alterando o arquivo.txt

commit 730efa2e12306dc7cefd961fb900185225d2cc54
Author: Marcelo de Paiva Barbieri <[e-mail]>
Date:   Wed Jul 31 16:56:08 2024 -0300

    Adicionando arquivo *.txt:


$ git checkout 730efa2e12306dc7cefd961fb900185225d2cc54
Note: switching to '730efa2e12306dc7cefd961fb900185225d2cc54'.

You are in 'detached HEAD' state. You can look around, make experimental
changes and commit them, and you can discard any commits you make in this
state without impacting any branches by switching back to a branch.

If you want to create a new branch to retain commits you create, you may
do so (now or later) by using -c with the switch command. Example:

  git switch -c <new-branch-name>

Or undo this operation with:

  git switch -

Turn off this advice by setting config variable advice.detachedHead to false

HEAD is now at 730efa2 Adicionando arquivo *.txt:


$ cat arquivo.txt

Checkout Main

$ git log
commit 730efa2e12306dc7cefd961fb900185225d2cc54 (HEAD)
Author: Marcelo de Paiva Barbieri <[e-mail]>
Date:   Wed Jul 31 16:56:08 2024 -0300

    Adicionando arquivo *.txt:


$ git checkout main
Previous HEAD position was 730efa2 Adicionando arquivo *.txt:
Switched to branch 'main'


$ git log
commit cd24fc0e9eedbc4b9c835e7917aa2150ee134112 (HEAD -> main)
Author: Marcelo de Paiva Barbieri <[e-mail]>
Date:   Wed Jul 31 17:04:46 2024 -0300

    Alterando o arquivo.txt

commit 730efa2e12306dc7cefd961fb900185225d2cc54
Author: Marcelo de Paiva Barbieri <[e-mail]>
Date:   Wed Jul 31 16:56:08 2024 -0300

    Adicionando arquivo *.txt:
    
$ cat arquivo.txt
Teste

Git Reset Soft

Remove o último commit realizado mantendo as alterações untracked:

$ git log
commit cd24fc0e9eedbc4b9c835e7917aa2150ee134112 (HEAD -> main)
Author: Marcelo de Paiva Barbieri <[e-mail]>
Date:   Wed Jul 31 17:04:46 2024 -0300

    Alterando o arquivo.txt

commit 730efa2e12306dc7cefd961fb900185225d2cc54
Author: Marcelo de Paiva Barbieri <[e-mail]>
Date:   Wed Jul 31 16:56:08 2024 -0300

    Adicionando arquivo *.txt:



$ git reset  --soft HEAD~1


$ git log
commit 730efa2e12306dc7cefd961fb900185225d2cc54 (HEAD -> main)
Author: Marcelo de Paiva Barbieri <[e-mail]>
Date:   Wed Jul 31 16:56:08 2024 -0300

    Adicionando arquivo *.txt:


$ git status
On branch main
Changes to be committed:
  (use "git restore --staged <file>..." to unstage)
        modified:   arquivo.txt

Git Reset Hard

Para descartar as alterações:

$ git reset --hard
HEAD is now at 730efa2 Adicionando arquivo *.txt:


$ git status
On branch main
nothing to commit, working tree clean