git - move back to previous commit and delete current commit I am on -

-

i have following commits: 

$ git log --pretty=oneline ba69c7a4c4a642549e70319ccb1f7904893d6df1 ko added currentcat , works 63e61d861923694944084e47ed613385d329a36a ko added seperate cat function ad8be8da63e0381dfeb4a1db108021dd294b0556 init $

i want move 2nd commit 63e6 , delete ba69 commit. how do this?

for reference:

how show commit on: 

$ git rev-parse head ba69c7a4c4a642549e70319ccb1f7904893d6df1 $ git show | head -n 5 commit ba69c7a4c4a642549e70319ccb1f7904893d6df1 author: name <you@example.com> date:   wed feb 3 14:02:32 2016 +1300      ko added currentcat , works

edit1 per below comment, reset , commited again, can seen in git reflog

$ git reflog 9522fd7 head@{0}: commit: ko add iterate through currentcat 63e61d8 head@{1}: reset: moving 63e61 ba69c7a head@{2}: commit: ko added currentcat , works 63e61d8 head@{3}: commit: ko added seperate cat function ad8be8d head@{4}: clone: https://github.com/hattricknz/ud989-cat-clicker-ko-starter

after git reset --hard <commit>, git push -f origin force push , permanently delete commit repository history.

if want keep commit in repo history, use git revert <commit> revert commit don't want.


Comments

Post a Comment

Popular posts from this blog

Delphi XE2 Indy10 udp client-server interchange using SendBuffer-ReceiveBuffer -

-
i use delphi xe2 , indy10 udp protocol. can't receive server echo on client side if use receivebuffer method. got "socket error # 10040" although send small echo message server client. console application illustrate problem below. in advance. program project1; {$apptype console} {$r *.res} uses system.sysutils, idglobal, idbasecomponent, idcomponent, idsockethandle, idudpclient, idudpserver, idudpbase, idstack; type tudp_serv = class(tidudpserver) procedure udpsvudpread(athread: tidudplistenerthread; adata: tidbytes; abinding: tidsockethandle); end; var udpserver: tudp_serv; udpcl: tidudpclient; bsnd, brcv: tbytes; s: string; k: integer; //============================================================================== procedure tudp_serv.udpsvudpread(athread: tidudplistenerthread; adata: tidbytes; abinding: tidsockethandle); begin writeln(' server read: ' + tohex(adata, length(adata))); abinding sendto(peerip, peerport, adat...
Read more

Qt ActiveX WMI QAxBase::dynamicCallHelper: ItemIndex(int): No such property in -

-
i new windows programming. here goes code objiwbemlocator = new qaxobject("wbemscripting.swbemlocator"); objwmiservice = objiwbemlocator->querysubobject("connectserver(qstring&,qstring&)",qstring("."),qstring("root\\cimv2")); qaxobject* returnlist = objwmiservice->querysubobject("execquery(qstring&)", qstring("select * %1").arg(domain)); qaxobject* result = returnlist->querysubobject("itemindex(int)", 0); i getting error on runtime qt activex wmi qaxbase::dynamiccallhelper: itemindex(int): no such property in but itemindex method exists msdn says the itemindex method not work collections not contain swbemobjects, such swbemmethodset, swbemnamedvalueset, swbemprivilegeset, swbempropertyset, , swbemqualifierset. what selecting ? have tried iterating on collection ? plus need minimum windows vista itemindex method. hope helps
Read more

Enable autocomplete or intellisense in Atom editor for PHP -

-
i'm first time user of atom editor php code. atom can autocomplete built-in functions of php. possible make editor autocomplete custom function written in separate file? function.php <?php function printsomething() { echo "hello world"; } index.php <?php require_once "function.php"; printsomething(); // autocompleted atom editor while typing thanks in advance. there text file in %userprofile%.atom called snippets.cson. in there can add snippet. more this: http://flight-manual.atom.io/using-atom/sections/snippets/ but need think can use later on other files well. otherwise need copy , paste.
Read more