The other day, I was working on a feature for Real Travel using our current branching strategy in that each release we do is a separate branch. Not sure if it was a cause of lack of sleep from late hours pulled, but I accidentally deleted my local and remote copy of the branch before I merged it back into the master branch for release. After a quick state of shock and thoughts running through my head of losing hours of work, I calmed down and relied on my Git knowledge.
Reading your full commit history
There are two ways to read the commit history in git. The first way shows a list of details commits while the other shows the log in reference to the current HEAD.
1 | // log of detailed commits by users |
2 | $> git log |
3 | |
4 | // reference log compared to the current HEAD |
5 | $> git reflog |
Using the reflog command, I was able to find out exactly where the last reference to my deleted branch was. An example output of the reflog might look like this:
1 | c7f3d98 HEAD@{0}: commit: Merged in some code |
2 | f5716c8 HEAD@{1}: pull : Fast-forward |
3 | d93c27b HEAD@{2}: commit: Added some items to project |
4 | ... |
Now the reflog will not show exactly where the branch was deleted, but if you remember your last commit to that branch and have a detailed enough message, it should be easy to find and restore.
Restoring your branch is straight forward by checking out the HEAD you want to a new branch.
1 | $> git checkout -b my_new_branch HEAD@{5} |
You can also use the hash too to checkout the new branch.
1 | $> git checkout -b my_new_branch d93c27b |
Simple enough and now I can move on with actually merging the branch in before deletion.