$ git reset HEAD~
fatal: ambiguous argument 'HEAD~': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
For example, if the user wishes to view 5 commits from the current HEAD in the past the command is
? git rebase -i HEAD~3
without a number, go to log to check SHA1.
? git log --oneline
--oneline will make log easy to read.
pick the SHA1 of the oldest commit you want to squash.
? git rebase -i 345678
Then get into interactive mode.
pick 123456 a
pick 234567 b
pick 345678 c
# Rebase 123456..345678 onto 456789## Commands:# p, pick = use commit# r, reword = use commit, but edit the commit message# e, edit = use commit, but stop for amending# s, squash = use commit, but meld into previous commit# f, fixup = like "squash", but discard this commit's log message## If you remove a line here THAT COMMIT WILL BE LOST.# However, if you remove everything, the rebase will be aborted.#
edit top of this part like below.
squash 123456 a
squash 234567 b
pick 345678 c
:wq save and quit
get another editor.
# This is a combination of 3 commits.# The first commit's message is:
a
# This is the 2nd commit message:
b
# This is the 3rd commit message:
c
:wq save and quit editor.
and log, it should become cleaner.
as the first interactive mode shows, there are tons of things, we can do with git rebase. Maybe explore in the future?.
solution with git reset
? git reset --soft HEAD~1
Assuming ~n is the number of commits to softly un-commit (i.e. ~1, ~2,...), or like before give a SHA1 with a simple git log.
? git commit --amend
which is pretty much the same as a long-range of squash and one pick.
--hard discard changes totally. --soft keep changes. If git commit, there will be the same commit that undone one.
rather than return to one commit before, give a specific commit id like 8a15r31, is the same.
* Force push to remote
After a local undo procedure, then push remote. If you just normal push, there will be conflict. Therefore, we need to use Force Push with a -f flag.
? git push -f origin master
[origin master] is the branch that has the wrong commit.
Normally, don't use this way except you have full control of the repository that you're working on.
These will create a new commit to 'kill' the last commit, without --no-commit or -n, get into vi-mode to edit commit comment, if no editing comment will seem like
Revert "commit comment"
This reverts commit d7795f88ebd5bf427c4c20faa9d372c997c8e490.
* Push to remote
? git push origin master
Push commit to the remote.
Here is the complete solution, if you deal with local, Github and server.
$ ssh-keygen
Generating public/private rsa key pair.
Enter file in which to save the key (/home/[username_ubuntu]/.ssh/id_rsa):
Enter passphrase (empty for no passphrase):
Enter same passphrase again:
Your identification has been saved in /home/[username_ubuntu]/.ssh/id_rsa.
Your public key has been saved in /home/[username_ubuntu]/.ssh/id_rsa.pub.
The key fingerprint is:
SHA256:hxbYsu6UHql6qA4tIIA7BnbVktsubFbEV6ewBQw+hmM [username_ubuntu]@DESKTOP-QDJ9F6V
The key's randomart image is:
+---[RSA 2048]----+
| hogehoge |
| foobar |
| hogehoge |
| foobar |
| hogehoge |
| foobar |
| hogehoge |
| foobar |
| hogehoge |
+----[SHA256]-----+
config ファイルと生成し、ホスト名、ドメイン、ユーザー名、秘密鍵のパスを記述する。
vim /home/[username_ubuntu]/.ssh/config
Host github
HostName github.com
User git
IdentityFile /home/[username_ubuntu]/.ssh/config/id_rsa
もしくは
Host gitlab
HostName gitlab.com
User git
IdentityFile /home/[username_ubuntu]/.ssh/config/id_rsa
$ ssh github
PTY allocation request failed on channel 0
Hi oasis-forever! You've successfully authenticated, but GitHub does not provide shell access.
Connection to github.com closed.
$ ssh-keygen
Generating public/private rsa key pair.
Enter file in which to save the key (/home/[username_ubuntu]/.ssh/id_rsa):
Enter passphrase (empty for no passphrase):
Enter same passphrase again:
Your identification has been saved in /home/[username_ubuntu]/.ssh/id_rsa.
Your public key has been saved in /home/[username_ubuntu]/.ssh/id_rsa.pub.
The key fingerprint is:
SHA256:hxbYsu6UHql6qA4tIIA7BnbVktsubFbEV6ewBQw+hmM [username_ubuntu]@DESKTOP-QDJ9F6V
The key's randomart image is:
+---[RSA 2048]----+
| hogehoge |
| foobar |
| hogehoge |
| foobar |
| hogehoge |
| foobar |
| hogehoge |
| foobar |
| hogehoge |
+----[SHA256]-----+
config ファイルと生成し、ホスト名、ドメイン、ユーザー名、秘密鍵のパスを記述する。
vim /home/[username_ubuntu]/.ssh/config
Host github
HostName github.com
User git
IdentityFile /home/[username_ubuntu]/.ssh/config/id_rsa
もしくは
Host gitlab
HostName gitlab.com
User git
IdentityFile /home/[username_ubuntu]/.ssh/config/id_rsa
$ ssh github
PTY allocation request failed on channel 0
Hi oasis-forever! You've successfully authenticated, but GitHub does not provide shell access.
Connection to github.com closed.
