Undo a Git merge, but keep later changes, and rewrite history -

-

i have bunch of branches, each different features. i'll have branch "not_master" contains master+feature so: 

(not_master)     a--b--c--d--e---m--x--y--z (feature a)           --h--i--j-/

sometimes want unmerge feature a, keep commits x,y,z in "not_master".

in other words, this: 

(not_master)     a--b--c--d--e--x--y--z

i see can git revert -m 1 m add commit end reverts changes, don't want since these commits haven't been published yet adding more commits makes history harder read.

others suggest doing git reset --hard m, dump changes of x,y,z. thinking wrong way? should git reset --hard m , cherry pick x,y,z?

git rebase want. git rebase -i <commit e> should work: open editor, , delete merge commit , save.

you should able directly specify rebasing x..z onto e, sorting out semantics of command-line bit hairy. if i'm reading man page right, should git rebase --onto <commit e> <commit m> not_master.

edit: tested , appears work:

mkdir foo; cd foo git init touch initial git add initial git commit -m 'initial' git checkout -b topic touch topic git add topic git commit -m 'topic' git checkout master touch master git add master git commit -m 'master' git tag pre_merge git merge topic git tag merge touch post_topic git add post_topic git commit -m 'post topic' git rebase --onto pre_merge merge master

results in history of

initial -- master -- post topic  (master)       \        \-- topic                 (topic)

Comments

Post a Comment

Popular posts from this blog

java - SNMP4J General Variable Binding Error -

-
i trying use snmp4j snmp bulkget. when ever use snmp4j make call returned responseevent error says "general variable binding error" , data returned equal null. to debug: print out, console, exact oid , version number using in snmp4j. use printed out data snmpwalk on command line. valid results. know sending snmp4j correct pdu correct oid, version number, max repititions, etc. i have used snmp4j , code wrote succesffuly monitor other devices years. don't know different time. leaving me stumped. why "general variable binding error?" causes error? ideas debug? can reproduced? if so, first action should using wireshark or microsoft network monitor capture network packets. my guess agent gives generr response, not surprising, http://www.ietf.org/rfc/rfc1157.txt
Read more

windows - Python Service Installation - "Could not find PythonClass entry" -

-
i working on building python service. inducing error, not sure inducing it. ps c:\...> python .\file.py debug debugging service myservice - press ctrl+c stop. error 0xc00000f4 - not find service's pythonclass entry in registry error 1814 - specified resource name cannot found in image file. error 0xc0000080 - not locate module name in python class string (ie, no '.') this error coming pythonservicemessages.mc in pythonwin32. it turns out error result caused exception being thrown , python script dying off.
Read more

Determine if a XmlNode is empty or null in C#? -

-
the following code takes xmlnode data type , populates dataset object xmlnode content. write dataset's content file. public void populatedataset(xmlnode node) { xmlnodereader reader = new xmlnodereader(node); dataset ds = new dataset(); ds.readxml(reader); system.guid guid = system.guid.newguid(); string name = string.format("{0}{1}_{2}.xml", utility.xmloutputpath, utility.xmloutputfilename, guid.tostring()); //need write "node empty" file if xmlnode object empty of null ds.writexml(name, xmlwritemode.ignoreschema); } the problem encountered 1 scenario not write content file. how determine if xmlnode object null or empty? you can check if node parameter null or has innertext or innerxml properties null or empty, when enter method before creating xmlnodereader .
Read more