Skip to main content

WILT: Recover a deleted GIT branch


Lets say you just deleted your gits local and remote branches and wanted to recover them back. You can start by recovering the local branch and pushing it onto the remote.

To start with, you need to execute the following command and figure out the SHA1 of the last commit you did onto your deleted branch

$ git reflog

dcdae48 HEAD@{0}: checkout: moving xxxxxxxxxxxxx
74041c0 HEAD@{1}: commit: UT fixes.
2045bbd HEAD@{2}: commit (merge): xxxxxxxxxxxxx
e099ba5 HEAD@{3}: checkout: moving xxxxxxxxxxxxx
be0992e HEAD@{4}: checkout: moving xxxxxxxxxxxxx
The commits are listed from latest to oldest. Pick up the latest commit with your changes for the deleted branch. Lets say 74041c0.

Now checkout the master of your branch and merge the changes from the selected commit onto it.

$ git checkout master
$ git merge 74041c0

You can also create a branch directly from the SHA1:

$ git branch SHA1
or
$ git checkout -b SHA1
Resolve any merge conflicts that may arise and your are all set.


Comments

Popular posts from this blog

Solved: Fix for Git clone failure due to GnuTLS recv error (-9)

My devstack installation was failing with an error reported by the GnuTLS module as shown below: $ git clone https://github.com/openstack/horizon.git /opt/stack/horizon --branch master Cloning into '/opt/stack/horizon'... remote: Counting objects: 154213, done. remote: Compressing objects: 100% (11/11), done. error: RPC failed; curl 56 GnuTLS recv error (-9): A TLS packet with unexpected length was received. fatal: The remote end hung up unexpectedly fatal: early EOF fatal: index-pack failed The following Git config changes fixed the issue for me. Am hoping it will be useful for someone out there: $ git config http.sslVerify false $ git config --global http.postBuffer 1048576000

QuickBite: Tap Vs Veth

Linux supports virtual networking via various artifacts such as: Soft Switches (Linux Bridge, OpenVSwitch) Virtual Network Adapters (tun, tap, veth and a few more) In this blog, we will look at the virtual network adapters tap and veth. From a practical view point, both seem to be having the same functionality and its a bit confusing as to where to use what. A quick definition of tap/veth is as follows: TAP A TAP is a simulated interface which exists only in the kernel and has no physical component associated with it. It can be viewed as a simple Point-to-Point or Ethernet device, which instead of receiving packets from a physical media, receives them from user space program and instead of sending packets via physical media writes them to the user space program. When a user space program (in our case the VM) gets attached to the tap interface it gets hold of a file descriptor, reading from which gives it the data being sent on the tap interface. Writing to the file descri...

[Solved] Fixing ping: ***** : Name or service not known issue

I have a Virtualbox VM running Ubuntu 19.05 Desktop version and the network is managed by NetworkManager. It has two interfaces attached to NAT and HostOnly networks. Due to some reason, I was not able to ping my office site and when I looked up in resolv.conf I see that its a symbolic link auto generated by systemd-resolve. One thing that caught my attention was that the name server was set as below: nameserver 127.0.0.53 The following sequence of steps helped me in resolving this issue: UI NetworkManager --> IPV4 --> Set DNS to Manual and add 1.1.1.1, 8.8.8.8 for dns. Then run the below command sudo dhclient Hope this helps someone out there.