Revert changes to a file in a commit || Revert changes to a file from pushed commit

-

Here are our git logs

343333 Good commit

457g222 In this commit we want some revert || BAD Commit

2343534 Initial commit

Rebase from the previous commit of BAD Commit, amend the problem commit, & continue.


1) Start interactive rebase:

   git rebase -i 2343534

2) Mark the problem commit for edit in the editor by changing pick to e (for edit):

   e 457g222
   pick 343333

3) Revert changes to the bad file:

   git show -- file_that_you_want_to_revert.txt | git apply -R

4) Add the changes & amend the commit or make new commit

   git add badfile.txt 
   git commit --amend //if you want to amend it 
   git commit -m "your commit message here" //if you want to create new commit

5) Finish the rebase or push to remote

  git rebase --continue //if you did not created new commit in previous steps
  git push origin_name branch_name -f  //if created new commit in previour steps 

Popular posts from this blog

Completely uninstall elasticsearch in Linux

-
sudo apt-get remove elasticsearch sudo apt-get --purge autoremove elasticsearch sudo dpkg --remove elasticsearch sudo dpkg --purge elasticsearch sudo dpkg --purge --force-all elasticsearch sudo rm -rf /var/lib/elasticsearch/ sudo rm -rf /etc/elasticsearch If still facing any issues then you have to delete source file too. cd /etc/apt/sources.list.d/ sudo rm -rf elastic-*   Install Elasticsearch in ubuntu 20, 18, 16
Read more

Install Elastic search 5.x in ubuntu 20, 18, 16

-
Look for OpenJDK in APT sudo apt search openjdk Install OpenJDK 8 sudo apt-get install openjdk-8-jdk Add the proper GPG key for ElasticSearch wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add - Make sure to install/update transport sudo apt-get install apt-transport-https Save the repo definition echo "deb https://artifacts.elastic.co/packages/5.x/apt stable main" | sudo tee -a /etc/apt/sources.list.d/elastic-5.x.list Update APT and install ElasticSearch from APT sudo apt-get update && sudo apt-get install elasticsearch Reload the daemon sudo /bin/systemctl daemon-reload Allow ElasticSearch to start on boot sudo /bin/systemctl enable elasticsearch.service Lets fire up ElasticSearch... sudo systemctl start elasticsearch.service Lets see if we have some logs sudo ls -la /var/log/elasticsearch/ Have a look at the logs and make sure that ElasticSearch has properly initiated sudo cat /var/log/elasticsearch/elasticsearch.
Read more