git - undo commit in merged branch -


commit graph (how is):

* hash1 - (head) last commit * hash2 - merge commit |\ | * hash3 - last branch commit should undone | * hash4 - commit should have been merged instead of hash3 | * hash5 - first branch commit * | hash6 - commit on master after branch creation |/ * hash7 - before trouble began ...

commit hash4 last working commit, on different branch (not master). hash3 bad commit breaks project, merged master (hash2). hash1 unsuccessful try fix. how can revert hash4 , merge hash6 working project again?

commit graph (how should be):

* hash2 - merge commit |\ | * hash4 - commit should have been merged instead of hash3 | * hash5 - first branch commit * | hash6 - commit on master after branch creation |/ * hash7 - before trouble began ...

you have several options:

git reflog

reflog store history of every change made head. can checkout repository given commit (detached head), create branch point , stuff.

for example:

git reflog .. find out head@{n} of desired commit git checkout head@{n} git checkout -b my_new_branch // @ point have new branch **head4** last commit

git revert

git revert lets "rollback" = revert commit(s) wish discard.

git revert sha1 sha1 sha1 sha1  git revert head3

this create commit undo of changes made in head3


Comments

Post a Comment

Popular posts from this blog

How to access a php class file from PHPFox framework into javascript code written in simple HTML file? -

i've website developed using phpfox v3.0.7 . now i'm trying implement 'sse(server sent events)' 1 of php files. reference i'm giving below necessary code part of file. file titled process.class.php , present @ location /var/www/module/notification/include/service/process.class.php present on server having ip http://34.124.40.142/ . <?php /** * [phpfox_header] */ header('content-type: text/event-stream'); header('cache-control: no-cache'); defined('phpfox') or exit('no dice!'); /** * * * @copyright [phpfox_copyright] * @author raymond benc * @package phpfox_service * @version $id: service.class.php 67 2009-01-20 11:32:45z raymond_benc $ */ class notification_service_process extends phpfox_service { /** * class constructor */ public function __construct() { $this->_stable = phpfox::gett('notification'); } public function add($...
Read more

java - JavaScript + Thymeleaf - select onchange -

i have list of objects services in thymeleaf context, , have following @ page: <select id="inputservice" name="idservice" size="1"> <option th:each="service : ${services}" th:text="${service.name}" th:value="${service.idservice}"/> </select> <p id="selectedservicelimits"></p> each object services contains fields minamount , maxamount . how can print p element these 2 fields of selected service in select javascript? , how can print these 2 fields of option selected when document ready? thanks! <script th:inline="javascript"> /*<![cdata[*/ function showlimits() { var services = /*[[${services}]]*/ null; var selectedindex = $("#inputservice option:selected").index(); var service = services[selectedindex]; $("#amountlimits").text("Ми...
Read more

node.js - Using Node without global install -

i'm working on few node & electron (atom shell) projects , i'm curious how them work without user having install node globally. i've seen few applications including node directory in project contains node.exe binary. how go setting node project use binary? edit: thought should add, i've searched everywhere answer this, unrelated results.
Read more