(Pronounced as git-yes) Get out of apocalypse
In most of the scenarios, it is assumed that the commits are not pushed to origin (remote) yet. If you are going to do force push, please know the consequences of doing so before going ahead.
Do git reflog and find the point where you want to go. (Ex: HEAD@{10})
You will find something like the below in git reflog
git reflog
<sha> HEAD@{9}: rebase: action
<sha> HEAD@{10}: commit: action
Use the value to do a hard reset.
git reset --hard HEAD@{10}
The rebase you did is undone.
You can reset to the previous known commit in that branch, before the merge was done and after that
try merging with --no-ff argument, which will force git to add a merge commit.
git reset --hard <sha>
git merge test --no-ff
Or you can use git reflog to go back to the previous sane action and do merge again with --no-ff argument.
See this for more information.
Try git's bisect functionality.
git bisect
git rebase -i head~2
Display interactive rebase for the last 2 commits from head. Choose the number based on where your commit lies from head. If it is the 10th commit, choose head~10. You will get something like below
pick <sha> <commit message>
pick <sha> <commit message>
Change the command to edit correspoding to the commit which you want to modify
pick <sha> <commit message>
edit <sha> <commit message>
Save and the rebase will stop at the 2nd commit. You can amend the commit to change the commit message. Do git rebase --continue to finish the rebase.
git commit --amend
git rebase --continue
You have made a commit, but now you want to modify some changes that went into that commit.
git reset --soft HEAD~1
This will remove the commit, but the changes will be staged.
git stash save --keep-index
git stash drop
You have dropped a stash, but now you want it back. If you know the hash of the dropped stash you can do the below.
git stash apply $stash_hash
When you drop a stash, a hash of it is printed to the screen. If you haven't closed your terminal, you can locate it by scrolling to the top. If you can't find it, execute the below command.
gitk --all $( git fsck --no-reflog | awk '/dangling commit/ {print $3}' )
This will open gitk (git gui). To spot stash commits, look for commit messages of this form:
WIP on somebranch: commithash Some old commit message
Once you know the hash of the commit you want, you can apply it as a stash
git stash apply $stash_hash
If you want to copy an entire file from one branch into another branch, do the below
git checkout bugfix README.md
Execute the above command from the branch, where you want the file to be copied.
If you want to review the changes done in a particular commit.
git show <sha>
git show stash{0}
Say you committed changes of 2 files. Now you want to revert the changes of one of the files.
git show <sha> -- some_file.c | git apply -R
This command will undo the changes, but these are not staged. So you have to add and commit these.
To get the count for a specific revision
git rev-list --count <revision>
To get the count across all branches
git rev-list --all --count
git revert <sha>
git push origin HEAD
This is easy since we don't have type the entire branch name.
git remote prune <remotename>
Use the above command to delete all stale remote-tracking branches for a given remote (i.e. those that follow branches which were removed in remote repository)
If you want to rename a branch while pointed to any branch, do:
git branch -m <oldname> <newname>
If you want to rename the current branch, you can do:
git branch -m <newname>